Refactor cloud-plugin-network-nvp project into Maven default structure
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93b0989d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93b0989d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93b0989d Branch: refs/heads/deploy-from-snapshot Commit: 93b0989deaf01ffae3242761174098ca5207b53c Parents: 83fd8f6 Author: Miguel Ferreira <miguelferre...@me.com> Authored: Sat Aug 22 20:48:27 2015 +0200 Committer: Miguel Ferreira <miguelferre...@me.com> Committed: Tue Aug 25 17:36:10 2015 +0200 ---------------------------------------------------------------------- plugins/network-elements/nicira-nvp/pom.xml | 11 +- .../META-INF/cloudstack/nvp/module.properties | 21 - .../cloudstack/nvp/spring-nvp-context.xml | 42 - ...ortForwardingRulesOnLogicalRouterAnswer.java | 35 - ...rtForwardingRulesOnLogicalRouterCommand.java | 63 -- ...ConfigurePublicIpsOnLogicalRouterAnswer.java | 32 - ...onfigurePublicIpsOnLogicalRouterCommand.java | 66 -- ...gureStaticNatRulesOnLogicalRouterAnswer.java | 44 - ...ureStaticNatRulesOnLogicalRouterCommand.java | 65 -- .../agent/api/CreateLogicalRouterAnswer.java | 42 - .../agent/api/CreateLogicalRouterCommand.java | 116 --- .../agent/api/CreateLogicalSwitchAnswer.java | 38 - .../agent/api/CreateLogicalSwitchCommand.java | 57 -- .../api/CreateLogicalSwitchPortAnswer.java | 38 - .../api/CreateLogicalSwitchPortCommand.java | 56 -- .../agent/api/DeleteLogicalRouterAnswer.java | 34 - .../agent/api/DeleteLogicalRouterCommand.java | 44 - .../agent/api/DeleteLogicalSwitchAnswer.java | 32 - .../agent/api/DeleteLogicalSwitchCommand.java | 38 - .../api/DeleteLogicalSwitchPortAnswer.java | 32 - .../api/DeleteLogicalSwitchPortCommand.java | 44 - .../agent/api/FindLogicalSwitchPortAnswer.java | 38 - .../agent/api/FindLogicalSwitchPortCommand.java | 44 - .../agent/api/StartupNiciraNvpCommand.java | 30 - .../api/UpdateLogicalSwitchPortAnswer.java | 38 - .../api/UpdateLogicalSwitchPortCommand.java | 63 -- .../api/commands/AddNiciraNvpDeviceCmd.java | 154 ---- .../api/commands/DeleteNiciraNvpDeviceCmd.java | 112 --- .../ListNiciraNvpDeviceNetworksCmd.java | 111 --- .../api/commands/ListNiciraNvpDevicesCmd.java | 108 --- .../api/response/NiciraNvpDeviceResponse.java | 89 -- .../com/cloud/network/NiciraNvpDeviceVO.java | 99 --- .../cloud/network/NiciraNvpNicMappingVO.java | 87 -- .../cloud/network/NiciraNvpRouterMappingVO.java | 85 -- .../src/com/cloud/network/dao/NiciraNvpDao.java | 35 - .../com/cloud/network/dao/NiciraNvpDaoImpl.java | 53 -- .../network/dao/NiciraNvpNicMappingDao.java | 32 - .../network/dao/NiciraNvpNicMappingDaoImpl.java | 51 -- .../network/dao/NiciraNvpRouterMappingDao.java | 28 - .../dao/NiciraNvpRouterMappingDaoImpl.java | 51 -- .../cloud/network/element/NiciraNvpElement.java | 849 ------------------ .../element/NiciraNvpElementService.java | 45 - .../network/guru/NiciraNvpGuestNetworkGuru.java | 256 ------ .../network/nicira/AccessConfiguration.java | 44 - .../com/cloud/network/nicira/AccessRule.java | 58 -- .../src/com/cloud/network/nicira/Acl.java | 23 - .../src/com/cloud/network/nicira/AclRule.java | 209 ----- .../com/cloud/network/nicira/Attachment.java | 24 - .../cloud/network/nicira/BaseNiciraEntity.java | 85 -- .../network/nicira/BaseNiciraNamedEntity.java | 44 - .../network/nicira/ControlClusterStatus.java | 87 -- .../network/nicira/DestinationNatRule.java | 113 --- .../network/nicira/L3GatewayAttachment.java | 55 -- .../com/cloud/network/nicira/LogicalRouter.java | 71 -- .../cloud/network/nicira/LogicalRouterPort.java | 62 -- .../com/cloud/network/nicira/LogicalSwitch.java | 60 -- .../cloud/network/nicira/LogicalSwitchPort.java | 82 -- .../src/com/cloud/network/nicira/Match.java | 146 --- .../src/com/cloud/network/nicira/NatRule.java | 130 --- .../com/cloud/network/nicira/NiciraNvpApi.java | 658 -------------- .../network/nicira/NiciraNvpApiException.java | 39 - .../com/cloud/network/nicira/NiciraNvpList.java | 48 - .../com/cloud/network/nicira/NiciraNvpTag.java | 64 -- .../cloud/network/nicira/PatchAttachment.java | 41 - .../com/cloud/network/nicira/RouterNextHop.java | 40 - .../com/cloud/network/nicira/RoutingConfig.java | 24 - .../nicira/RoutingTableRoutingConfig.java | 30 - .../cloud/network/nicira/SecurityProfile.java | 24 - .../com/cloud/network/nicira/SecurityRule.java | 138 --- ...SingleDefaultRouteImplicitRoutingConfig.java | 40 - .../com/cloud/network/nicira/SourceNatRule.java | 119 --- .../network/nicira/TransportZoneBinding.java | 50 -- .../com/cloud/network/nicira/VifAttachment.java | 78 -- .../resource/NiciraNvpRequestWrapper.java | 77 -- .../network/resource/NiciraNvpResource.java | 319 ------- .../network/resource/NiciraNvpUtilities.java | 65 -- ...figurePortForwardingRulesCommandWrapper.java | 120 --- ...ciraNvpConfigurePublicIpsCommandWrapper.java | 60 -- ...vpConfigureStaticNatRulesCommandWrapper.java | 113 --- ...iraNvpCreateLogicalRouterCommandWrapper.java | 152 ---- ...iraNvpCreateLogicalSwitchCommandWrapper.java | 73 -- ...vpCreateLogicalSwitchPortCommandWrapper.java | 70 -- ...iraNvpDeleteLogicalRouterCommandWrapper.java | 50 -- ...iraNvpDeleteLogicalSwitchCommandWrapper.java | 49 -- ...vpDeleteLogicalSwitchPortCommandWrapper.java | 50 -- ...aNvpFindLogicalSwitchPortCommandWrapper.java | 59 -- .../NiciraNvpMaintainCommandWrapper.java | 36 - .../wrapper/NiciraNvpReadyCommandWrapper.java | 36 - ...vpUpdateLogicalSwitchPortCommandWrapper.java | 68 -- .../network/utils/CommandRetryUtility.java | 89 -- ...ortForwardingRulesOnLogicalRouterAnswer.java | 35 + ...rtForwardingRulesOnLogicalRouterCommand.java | 63 ++ ...ConfigurePublicIpsOnLogicalRouterAnswer.java | 32 + ...onfigurePublicIpsOnLogicalRouterCommand.java | 66 ++ ...gureStaticNatRulesOnLogicalRouterAnswer.java | 44 + ...ureStaticNatRulesOnLogicalRouterCommand.java | 65 ++ .../agent/api/CreateLogicalRouterAnswer.java | 42 + .../agent/api/CreateLogicalRouterCommand.java | 116 +++ .../agent/api/CreateLogicalSwitchAnswer.java | 38 + .../agent/api/CreateLogicalSwitchCommand.java | 57 ++ .../api/CreateLogicalSwitchPortAnswer.java | 38 + .../api/CreateLogicalSwitchPortCommand.java | 56 ++ .../agent/api/DeleteLogicalRouterAnswer.java | 34 + .../agent/api/DeleteLogicalRouterCommand.java | 44 + .../agent/api/DeleteLogicalSwitchAnswer.java | 32 + .../agent/api/DeleteLogicalSwitchCommand.java | 38 + .../api/DeleteLogicalSwitchPortAnswer.java | 32 + .../api/DeleteLogicalSwitchPortCommand.java | 44 + .../agent/api/FindLogicalSwitchPortAnswer.java | 38 + .../agent/api/FindLogicalSwitchPortCommand.java | 44 + .../agent/api/StartupNiciraNvpCommand.java | 30 + .../api/UpdateLogicalSwitchPortAnswer.java | 38 + .../api/UpdateLogicalSwitchPortCommand.java | 63 ++ .../api/commands/AddNiciraNvpDeviceCmd.java | 154 ++++ .../api/commands/DeleteNiciraNvpDeviceCmd.java | 112 +++ .../ListNiciraNvpDeviceNetworksCmd.java | 111 +++ .../api/commands/ListNiciraNvpDevicesCmd.java | 108 +++ .../api/response/NiciraNvpDeviceResponse.java | 89 ++ .../com/cloud/network/NiciraNvpDeviceVO.java | 99 +++ .../cloud/network/NiciraNvpNicMappingVO.java | 87 ++ .../cloud/network/NiciraNvpRouterMappingVO.java | 85 ++ .../com/cloud/network/dao/NiciraNvpDao.java | 35 + .../com/cloud/network/dao/NiciraNvpDaoImpl.java | 53 ++ .../network/dao/NiciraNvpNicMappingDao.java | 32 + .../network/dao/NiciraNvpNicMappingDaoImpl.java | 51 ++ .../network/dao/NiciraNvpRouterMappingDao.java | 28 + .../dao/NiciraNvpRouterMappingDaoImpl.java | 51 ++ .../cloud/network/element/NiciraNvpElement.java | 849 ++++++++++++++++++ .../element/NiciraNvpElementService.java | 45 + .../network/guru/NiciraNvpGuestNetworkGuru.java | 256 ++++++ .../network/nicira/AccessConfiguration.java | 44 + .../com/cloud/network/nicira/AccessRule.java | 58 ++ .../main/java/com/cloud/network/nicira/Acl.java | 23 + .../java/com/cloud/network/nicira/AclRule.java | 209 +++++ .../com/cloud/network/nicira/Attachment.java | 24 + .../cloud/network/nicira/BaseNiciraEntity.java | 85 ++ .../network/nicira/BaseNiciraNamedEntity.java | 44 + .../network/nicira/ControlClusterStatus.java | 87 ++ .../network/nicira/DestinationNatRule.java | 113 +++ .../network/nicira/L3GatewayAttachment.java | 55 ++ .../com/cloud/network/nicira/LogicalRouter.java | 71 ++ .../cloud/network/nicira/LogicalRouterPort.java | 62 ++ .../com/cloud/network/nicira/LogicalSwitch.java | 60 ++ .../cloud/network/nicira/LogicalSwitchPort.java | 82 ++ .../java/com/cloud/network/nicira/Match.java | 146 +++ .../java/com/cloud/network/nicira/NatRule.java | 130 +++ .../com/cloud/network/nicira/NiciraNvpApi.java | 658 ++++++++++++++ .../network/nicira/NiciraNvpApiException.java | 39 + .../com/cloud/network/nicira/NiciraNvpList.java | 48 + .../com/cloud/network/nicira/NiciraNvpTag.java | 64 ++ .../cloud/network/nicira/PatchAttachment.java | 41 + .../com/cloud/network/nicira/RouterNextHop.java | 40 + .../com/cloud/network/nicira/RoutingConfig.java | 24 + .../nicira/RoutingTableRoutingConfig.java | 30 + .../cloud/network/nicira/SecurityProfile.java | 24 + .../com/cloud/network/nicira/SecurityRule.java | 138 +++ ...SingleDefaultRouteImplicitRoutingConfig.java | 40 + .../com/cloud/network/nicira/SourceNatRule.java | 119 +++ .../network/nicira/TransportZoneBinding.java | 50 ++ .../com/cloud/network/nicira/VifAttachment.java | 78 ++ .../resource/NiciraNvpRequestWrapper.java | 77 ++ .../network/resource/NiciraNvpResource.java | 319 +++++++ .../network/resource/NiciraNvpUtilities.java | 65 ++ ...figurePortForwardingRulesCommandWrapper.java | 120 +++ ...ciraNvpConfigurePublicIpsCommandWrapper.java | 60 ++ ...vpConfigureStaticNatRulesCommandWrapper.java | 113 +++ ...iraNvpCreateLogicalRouterCommandWrapper.java | 152 ++++ ...iraNvpCreateLogicalSwitchCommandWrapper.java | 73 ++ ...vpCreateLogicalSwitchPortCommandWrapper.java | 70 ++ ...iraNvpDeleteLogicalRouterCommandWrapper.java | 50 ++ ...iraNvpDeleteLogicalSwitchCommandWrapper.java | 49 ++ ...vpDeleteLogicalSwitchPortCommandWrapper.java | 50 ++ ...aNvpFindLogicalSwitchPortCommandWrapper.java | 59 ++ .../NiciraNvpMaintainCommandWrapper.java | 36 + .../wrapper/NiciraNvpReadyCommandWrapper.java | 36 + ...vpUpdateLogicalSwitchPortCommandWrapper.java | 68 ++ .../network/utils/CommandRetryUtility.java | 89 ++ .../META-INF/cloudstack/nvp/module.properties | 21 + .../cloudstack/nvp/spring-nvp-context.xml | 42 + .../network/element/NiciraNvpElementTest.java | 217 +++++ .../guru/NiciraNvpGuestNetworkGuruTest.java | 476 ++++++++++ .../com/cloud/network/nicira/NatRuleTest.java | 55 ++ .../cloud/network/nicira/NiciraNvpApiIT.java | 347 ++++++++ .../cloud/network/nicira/NiciraNvpApiTest.java | 339 +++++++ .../com/cloud/network/nicira/NiciraTagTest.java | 58 ++ .../resource/NiciraNvpRequestWrapperTest.java | 255 ++++++ .../network/resource/NiciraNvpResourceTest.java | 882 +++++++++++++++++++ .../src/test/resources/config.properties | 23 + .../network/element/NiciraNvpElementTest.java | 217 ----- .../guru/NiciraNvpGuestNetworkGuruTest.java | 476 ---------- .../com/cloud/network/nicira/NatRuleTest.java | 55 -- .../cloud/network/nicira/NiciraNvpApiIT.java | 347 -------- .../cloud/network/nicira/NiciraNvpApiTest.java | 339 ------- .../com/cloud/network/nicira/NiciraTagTest.java | 58 -- .../resource/NiciraNvpRequestWrapperTest.java | 255 ------ .../network/resource/NiciraNvpResourceTest.java | 882 ------------------- .../nicira-nvp/test/resources/config.properties | 23 - 197 files changed, 10231 insertions(+), 10222 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 352155d..8567482 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -30,9 +30,18 @@ </parent> <build> + <sourceDirectory>src/main/java</sourceDirectory> + <testSourceDirectory>src/test/java</testSourceDirectory> + <outputDirectory>target/classes</outputDirectory> + <testOutputDirectory>target/test-classes</testOutputDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> <testResources> <testResource> - <directory>test/resources</directory> + <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> </testResources> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/module.properties ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/module.properties b/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/module.properties deleted file mode 100644 index 5085fce..0000000 --- a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/module.properties +++ /dev/null @@ -1,21 +0,0 @@ -# -# 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. -# - -name=nvp -parent=network \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml b/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml deleted file mode 100644 index cd8a2c9..0000000 --- a/plugins/network-elements/nicira-nvp/resources/META-INF/cloudstack/nvp/spring-nvp-context.xml +++ /dev/null @@ -1,42 +0,0 @@ -<!-- - - 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: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/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"; - > - - <bean id="niciraNvpDaoImpl" class="com.cloud.network.dao.NiciraNvpDaoImpl" /> - <bean id="niciraNvpNicMappingDaoImpl" class="com.cloud.network.dao.NiciraNvpNicMappingDaoImpl" /> - <bean id="niciraNvpRouterMappingDaoImpl" class="com.cloud.network.dao.NiciraNvpRouterMappingDaoImpl" /> - <bean id="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru"> - <property name="name" value="NiciraNvpGuestNetworkGuru" /> - </bean> - <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"> - <property name="name" value="NiciraNvp" /> - </bean> - -</beans> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java deleted file mode 100644 index 1765a81..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterAnswer.java +++ /dev/null @@ -1,35 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class ConfigurePortForwardingRulesOnLogicalRouterAnswer extends Answer { - - public ConfigurePortForwardingRulesOnLogicalRouterAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - public ConfigurePortForwardingRulesOnLogicalRouterAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java deleted file mode 100644 index 133714e..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePortForwardingRulesOnLogicalRouterCommand.java +++ /dev/null @@ -1,63 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -import java.util.List; - -import com.cloud.agent.api.to.PortForwardingRuleTO; - -/** - * - */ -public class ConfigurePortForwardingRulesOnLogicalRouterCommand extends Command { - - private String logicalRouterUuid; - private List<PortForwardingRuleTO> rules; - - public ConfigurePortForwardingRulesOnLogicalRouterCommand(final String logicalRouterUuid, final List<PortForwardingRuleTO> rules) { - this.logicalRouterUuid = logicalRouterUuid; - this.rules = rules; - } - - public String getLogicalRouterUuid() { - return logicalRouterUuid; - } - - public void setLogicalRouterUuid(final String logicalRouterUuid) { - this.logicalRouterUuid = logicalRouterUuid; - } - - public List<PortForwardingRuleTO> getRules() { - return rules; - } - - public void setRules(final List<PortForwardingRuleTO> rules) { - this.rules = rules; - } - - /* (non-Javadoc) - * @see com.cloud.agent.api.Command#executeInSequence() - */ - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java deleted file mode 100644 index 9da6caf..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterAnswer.java +++ /dev/null @@ -1,32 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class ConfigurePublicIpsOnLogicalRouterAnswer extends Answer { - - public ConfigurePublicIpsOnLogicalRouterAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - public ConfigurePublicIpsOnLogicalRouterAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java deleted file mode 100644 index ff81ae4..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigurePublicIpsOnLogicalRouterCommand.java +++ /dev/null @@ -1,66 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -import java.util.List; - -public class ConfigurePublicIpsOnLogicalRouterCommand extends Command { - - private String logicalRouterUuid; - private String l3GatewayServiceUuid; - private List<String> publicCidrs; - - public ConfigurePublicIpsOnLogicalRouterCommand(final String logicalRouterUuid, final String l3GatewayServiceUuid, final List<String> publicCidrs) { - super(); - this.logicalRouterUuid = logicalRouterUuid; - this.publicCidrs = publicCidrs; - this.l3GatewayServiceUuid = l3GatewayServiceUuid; - } - - public String getLogicalRouterUuid() { - return logicalRouterUuid; - } - - public void setLogicalRouterUuid(final String logicalRouterUuid) { - this.logicalRouterUuid = logicalRouterUuid; - } - - public String getL3GatewayServiceUuid() { - return l3GatewayServiceUuid; - } - - public void setL3GatewayServiceUuid(final String l3GatewayServiceUuid) { - this.l3GatewayServiceUuid = l3GatewayServiceUuid; - } - - public List<String> getPublicCidrs() { - return publicCidrs; - } - - public void setPublicCidrs(final List<String> publicCidrs) { - this.publicCidrs = publicCidrs; - } - - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java deleted file mode 100644 index 9074491..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterAnswer.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class ConfigureStaticNatRulesOnLogicalRouterAnswer extends Answer { - - /** - * @param command - * @param success - * @param details - */ - public ConfigureStaticNatRulesOnLogicalRouterAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - /** - * @param command - * @param e - */ - public ConfigureStaticNatRulesOnLogicalRouterAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java deleted file mode 100644 index b5434b3..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/ConfigureStaticNatRulesOnLogicalRouterCommand.java +++ /dev/null @@ -1,65 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -import java.util.List; - -import com.cloud.agent.api.to.StaticNatRuleTO; - -/** - * - */ -public class ConfigureStaticNatRulesOnLogicalRouterCommand extends Command { - - private String logicalRouterUuid; - private List<StaticNatRuleTO> rules; - - public ConfigureStaticNatRulesOnLogicalRouterCommand(final String logicalRouterUuid, final List<StaticNatRuleTO> rules) { - super(); - this.logicalRouterUuid = logicalRouterUuid; - this.rules = rules; - - } - - public String getLogicalRouterUuid() { - return logicalRouterUuid; - } - - public void setLogicalRouterUuid(final String logicalRouterUuid) { - this.logicalRouterUuid = logicalRouterUuid; - } - - public List<StaticNatRuleTO> getRules() { - return rules; - } - - public void setRules(final List<StaticNatRuleTO> rules) { - this.rules = rules; - } - - /* (non-Javadoc) - * @see com.cloud.agent.api.Command#executeInSequence() - */ - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java deleted file mode 100644 index 0172891..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterAnswer.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class CreateLogicalRouterAnswer extends Answer { - - private String logicalRouterUuid; - - public CreateLogicalRouterAnswer(final Command command, final boolean success, final String details, final String logicalRouterUuid) { - super(command, success, details); - this.logicalRouterUuid = logicalRouterUuid; - } - - public CreateLogicalRouterAnswer(final Command command, final Exception e) { - super(command, e); - } - - public String getLogicalRouterUuid() { - return logicalRouterUuid; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java deleted file mode 100644 index ff12b8d..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalRouterCommand.java +++ /dev/null @@ -1,116 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class CreateLogicalRouterCommand extends Command { - private String gatewayServiceUuid; - private String logicalSwitchUuid; - private long vlanId; - private String name; - private String ownerName; - private String publicIpCidr; - private String publicNextHop; - private String internalIpCidr; - - public CreateLogicalRouterCommand(final String gatewayServiceUuid, final long vlanId, final String logicalSwitchUuid, final String name, final String publicIpCidr, - final String publicNextHop, final String internalIpCidr, final String ownerName) { - super(); - this.gatewayServiceUuid = gatewayServiceUuid; - this.logicalSwitchUuid = logicalSwitchUuid; - this.vlanId = vlanId; - this.name = name; - this.ownerName = ownerName; - this.publicIpCidr = publicIpCidr; - this.publicNextHop = publicNextHop; - this.internalIpCidr = internalIpCidr; - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getGatewayServiceUuid() { - return gatewayServiceUuid; - } - - public void setGatewayServiceUuid(final String gatewayServiceUuid) { - this.gatewayServiceUuid = gatewayServiceUuid; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - - public void setLogicalSwitchUuid(final String logicalSwitchUuid) { - this.logicalSwitchUuid = logicalSwitchUuid; - } - - public long getVlanId() { - return vlanId; - } - - public void setVlanId(final long vlanId) { - this.vlanId = vlanId; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - public String getOwnerName() { - return ownerName; - } - - public void setOwnerName(final String ownerName) { - this.ownerName = ownerName; - } - - public String getPublicIpCidr() { - return publicIpCidr; - } - - public void setPublicIpCidr(final String publicIpCidr) { - this.publicIpCidr = publicIpCidr; - } - - public String getInternalIpCidr() { - return internalIpCidr; - } - - public void setInternalIpCidr(final String internalIpCidr) { - this.internalIpCidr = internalIpCidr; - } - - public String getPublicNextHop() { - return publicNextHop; - } - - public void setPublicNextHop(final String publicNextHop) { - this.publicNextHop = publicNextHop; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java deleted file mode 100644 index ee9924e..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchAnswer.java +++ /dev/null @@ -1,38 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class CreateLogicalSwitchAnswer extends Answer { - private String logicalSwitchUuid; - - public CreateLogicalSwitchAnswer(final Command command, final boolean success, final String details, final String logicalSwitchUuid) { - super(command, success, details); - this.logicalSwitchUuid = logicalSwitchUuid; - } - - public CreateLogicalSwitchAnswer(final Command command, final Exception e) { - super(command, e); - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java deleted file mode 100644 index 5dc8616..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchCommand.java +++ /dev/null @@ -1,57 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class CreateLogicalSwitchCommand extends Command { - - private final String transportUuid; - private final String transportType; - private final String name; - private final String ownerName; - - public CreateLogicalSwitchCommand(final String transportUuid, final String transportType, final String name, final String ownerName) { - this.transportUuid = transportUuid; - this.transportType = transportType; - this.name = name; - this.ownerName = ownerName; - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getTransportUuid() { - return transportUuid; - } - - public String getTransportType() { - return transportType; - } - - public String getName() { - return name; - } - - public String getOwnerName() { - return ownerName; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java deleted file mode 100644 index 8b09389..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortAnswer.java +++ /dev/null @@ -1,38 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class CreateLogicalSwitchPortAnswer extends Answer { - private String logicalSwitchPortUuid; - - public CreateLogicalSwitchPortAnswer(final Command command, final boolean success, final String details, final String localSwitchPortUuid) { - super(command, success, details); - logicalSwitchPortUuid = localSwitchPortUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwitchPortUuid; - } - - public CreateLogicalSwitchPortAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java deleted file mode 100644 index 6bc578f..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/CreateLogicalSwitchPortCommand.java +++ /dev/null @@ -1,56 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class CreateLogicalSwitchPortCommand extends Command { - private final String logicalSwitchUuid; - private final String attachmentUuid; - private final String ownerName; - private final String nicName; - - public CreateLogicalSwitchPortCommand(final String logicalSwitchUuid, final String attachmentUuid, final String ownerName, final String nicName) { - this.logicalSwitchUuid = logicalSwitchUuid; - this.attachmentUuid = attachmentUuid; - this.ownerName = ownerName; - this.nicName = nicName; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - - public String getAttachmentUuid() { - return attachmentUuid; - } - - public String getOwnerName() { - return ownerName; - } - - public String getNicName() { - return nicName; - } - - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java deleted file mode 100644 index f7f101d..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterAnswer.java +++ /dev/null @@ -1,34 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class DeleteLogicalRouterAnswer extends Answer { - - public DeleteLogicalRouterAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - public DeleteLogicalRouterAnswer(final Command command, final Exception e) { - super(command, e); - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java deleted file mode 100644 index 8fd14e9..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalRouterCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -/** - * - */ -public class DeleteLogicalRouterCommand extends Command { - - private final String logicalRouterUuid; - - public DeleteLogicalRouterCommand(String logicalRouterUuid) { - this.logicalRouterUuid = logicalRouterUuid; - } - - /* (non-Javadoc) - * @see com.cloud.agent.api.Command#executeInSequence() - */ - @Override - public boolean executeInSequence() { - return false; - } - - public String getLogicalRouterUuid() { - return logicalRouterUuid; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java deleted file mode 100644 index e2c483f..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchAnswer.java +++ /dev/null @@ -1,32 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class DeleteLogicalSwitchAnswer extends Answer { - - public DeleteLogicalSwitchAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - public DeleteLogicalSwitchAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java deleted file mode 100644 index dbfefe2..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchCommand.java +++ /dev/null @@ -1,38 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class DeleteLogicalSwitchCommand extends Command { - - private final String logicalSwitchUuid; - - public DeleteLogicalSwitchCommand(final String logicalSwitchUuid) { - this.logicalSwitchUuid = logicalSwitchUuid; - } - - @Override - public boolean executeInSequence() { - return false; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java deleted file mode 100644 index 1cd87ea..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortAnswer.java +++ /dev/null @@ -1,32 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class DeleteLogicalSwitchPortAnswer extends Answer { - - public DeleteLogicalSwitchPortAnswer(final Command command, final boolean success, final String details) { - super(command, success, details); - } - - public DeleteLogicalSwitchPortAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java deleted file mode 100644 index 4a5e607..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/DeleteLogicalSwitchPortCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class DeleteLogicalSwitchPortCommand extends Command { - private final String logicalSwitchUuid; - private final String logicalSwithPortUuid; - - public DeleteLogicalSwitchPortCommand(final String logicalSwitchUuid, final String logicalSwitchPortUuid) { - this.logicalSwitchUuid = logicalSwitchUuid; - logicalSwithPortUuid = logicalSwitchPortUuid; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwithPortUuid; - } - - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java deleted file mode 100644 index 0524531..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortAnswer.java +++ /dev/null @@ -1,38 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class FindLogicalSwitchPortAnswer extends Answer { - private String logicalSwitchPortUuid; - - public FindLogicalSwitchPortAnswer(final Command command, final boolean success, final String details, final String localSwitchPortUuid) { - super(command, success, details); - logicalSwitchPortUuid = localSwitchPortUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwitchPortUuid; - } - - public FindLogicalSwitchPortAnswer(final Command command, final Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java deleted file mode 100644 index ee00bd2..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/FindLogicalSwitchPortCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class FindLogicalSwitchPortCommand extends Command { - private final String logicalSwitchUuid; - private final String logicalSwitchPortUuid; - - public FindLogicalSwitchPortCommand(String logicalSwitchUuid, String logicalSwitchPortUuid) { - this.logicalSwitchUuid = logicalSwitchUuid; - this.logicalSwitchPortUuid = logicalSwitchPortUuid; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwitchPortUuid; - } - - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/StartupNiciraNvpCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/StartupNiciraNvpCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/StartupNiciraNvpCommand.java deleted file mode 100644 index 9597d2f..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/StartupNiciraNvpCommand.java +++ /dev/null @@ -1,30 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -import com.cloud.host.Host; - -public class StartupNiciraNvpCommand extends StartupCommand { - - public StartupNiciraNvpCommand() { - super(Host.Type.L2Networking); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java deleted file mode 100644 index 1471723..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortAnswer.java +++ /dev/null @@ -1,38 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class UpdateLogicalSwitchPortAnswer extends Answer { - private String logicalSwitchPortUuid; - - public UpdateLogicalSwitchPortAnswer(Command command, boolean success, String details, String localSwitchPortUuid) { - super(command, success, details); - logicalSwitchPortUuid = localSwitchPortUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwitchPortUuid; - } - - public UpdateLogicalSwitchPortAnswer(Command command, Exception e) { - super(command, e); - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java b/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java deleted file mode 100644 index 91682a1..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/agent/api/UpdateLogicalSwitchPortCommand.java +++ /dev/null @@ -1,63 +0,0 @@ -// -// 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. -// - -package com.cloud.agent.api; - -public class UpdateLogicalSwitchPortCommand extends Command { - private final String logicalSwitchUuid; - private final String logicalSwitchPortUuid; - private final String attachmentUuid; - private final String ownerName; - private final String nicName; - - public UpdateLogicalSwitchPortCommand(final String logicalSwitchPortUuid, final String logicalSwitchUuid, final String attachmentUuid, final String ownerName, - final String nicName) { - this.logicalSwitchUuid = logicalSwitchUuid; - this.logicalSwitchPortUuid = logicalSwitchPortUuid; - this.attachmentUuid = attachmentUuid; - this.ownerName = ownerName; - this.nicName = nicName; - } - - public String getLogicalSwitchUuid() { - return logicalSwitchUuid; - } - - public String getLogicalSwitchPortUuid() { - return logicalSwitchPortUuid; - } - - public String getAttachmentUuid() { - return attachmentUuid; - } - - public String getOwnerName() { - return ownerName; - } - - public String getNicName() { - return nicName; - } - - @Override - public boolean executeInSequence() { - return false; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java deleted file mode 100644 index 1a9be28..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/AddNiciraNvpDeviceCmd.java +++ /dev/null @@ -1,154 +0,0 @@ -// -// 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. -// - -package com.cloud.api.commands; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.cloudstack.context.CallContext; - -import com.cloud.api.response.NiciraNvpDeviceResponse; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.NiciraNvpDeviceVO; -import com.cloud.network.element.NiciraNvpElementService; -import com.cloud.utils.exception.CloudRuntimeException; - -@APICommand(name = "addNiciraNvpDevice", responseObject = NiciraNvpDeviceResponse.class, description = "Adds a Nicira NVP device", - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class AddNiciraNvpDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "addniciranvpdeviceresponse"; - @Inject - protected NiciraNvpElementService niciraNvpElementService; - - ///////////////////////////////////////////////////// - //////////////// API parameters ///////////////////// - ///////////////////////////////////////////////////// - - @Parameter(name = ApiConstants.PHYSICAL_NETWORK_ID, - type = CommandType.UUID, - entityType = PhysicalNetworkResponse.class, - required = true, - description = "the Physical Network ID") - private Long physicalNetworkId; - - @Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, required = true, description = "Hostname of ip address of the Nicira NVP Controller.") - private String host; - - @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Credentials to access the Nicira Controller API") - private String username; - - @Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING, required = true, description = "Credentials to access the Nicira Controller API") - private String password; - - @Parameter(name = ApiConstants.NICIRA_NVP_TRANSPORT_ZONE_UUID, - type = CommandType.STRING, - required = true, - description = "The Transportzone UUID configured on the Nicira Controller") - private String transportzoneuuid; - - @Parameter(name = ApiConstants.NICIRA_NVP_GATEWAYSERVICE_UUID, - type = CommandType.STRING, - required = false, - description = "The L3 Gateway Service UUID configured on the Nicira Controller") - private String l3gatewayserviceuuid; - - ///////////////////////////////////////////////////// - /////////////////// Accessors /////////////////////// - ///////////////////////////////////////////////////// - - public Long getPhysicalNetworkId() { - return physicalNetworkId; - } - - public String getHost() { - return host; - } - - public String getUsername() { - return username; - } - - public String getPassword() { - return password; - } - - public String getTransportzoneUuid() { - return transportzoneuuid; - } - - public String getL3GatewayServiceUuid() { - return l3gatewayserviceuuid; - } - - ///////////////////////////////////////////////////// - /////////////// API Implementation/////////////////// - ///////////////////////////////////////////////////// - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - NiciraNvpDeviceVO niciraNvpDeviceVO = niciraNvpElementService.addNiciraNvpDevice(this); - if (niciraNvpDeviceVO != null) { - NiciraNvpDeviceResponse response = niciraNvpElementService.createNiciraNvpDeviceResponse(niciraNvpDeviceVO); - response.setObjectName("niciranvpdevice"); - response.setResponseName(getCommandName()); - setResponseObject(response); - } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Nicira NVP device due to internal error."); - } - } catch (InvalidParameterValueException invalidParamExcp) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); - } catch (CloudRuntimeException runtimeExcp) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); - } - } - - @Override - public String getCommandName() { - return s_name; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } - - @Override - public String getEventType() { - return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_ADD; - } - - @Override - public String getEventDescription() { - return "Adding a Nicira Nvp Controller"; - } -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java deleted file mode 100644 index d3fadea..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/DeleteNiciraNvpDeviceCmd.java +++ /dev/null @@ -1,112 +0,0 @@ -// -// 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. -// - -package com.cloud.api.commands; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.SuccessResponse; -import org.apache.cloudstack.context.CallContext; - -import com.cloud.api.response.NiciraNvpDeviceResponse; -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.element.NiciraNvpElementService; -import com.cloud.utils.exception.CloudRuntimeException; - -@APICommand(name = "deleteNiciraNvpDevice", responseObject = SuccessResponse.class, description = " delete a nicira nvp device", - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class DeleteNiciraNvpDeviceCmd extends BaseAsyncCmd { - private static final String s_name = "deleteniciranvpdeviceresponse"; - @Inject - protected NiciraNvpElementService niciraNvpElementService; - - ///////////////////////////////////////////////////// - //////////////// API parameters ///////////////////// - ///////////////////////////////////////////////////// - - @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, - type = CommandType.UUID, - entityType = NiciraNvpDeviceResponse.class, - required = true, - description = "Nicira device ID") - private Long niciraNvpDeviceId; - - ///////////////////////////////////////////////////// - /////////////////// Accessors /////////////////////// - ///////////////////////////////////////////////////// - - public Long getNiciraNvpDeviceId() { - return niciraNvpDeviceId; - } - - ///////////////////////////////////////////////////// - /////////////// API Implementation/////////////////// - ///////////////////////////////////////////////////// - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - boolean result = niciraNvpElementService.deleteNiciraNvpDevice(this); - if (result) { - SuccessResponse response = new SuccessResponse(getCommandName()); - response.setResponseName(getCommandName()); - setResponseObject(response); - } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Nicira device."); - } - } catch (InvalidParameterValueException invalidParamExcp) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); - } catch (CloudRuntimeException runtimeExcp) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); - } - } - - @Override - public String getCommandName() { - return s_name; - } - - @Override - public long getEntityOwnerId() { - return CallContext.current().getCallingAccount().getId(); - } - - @Override - public String getEventType() { - return EventTypes.EVENT_EXTERNAL_NVP_CONTROLLER_DELETE; - } - - @Override - public String getEventDescription() { - return "Deleting Nicira Nvp Controller"; - } - -} http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93b0989d/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java b/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java deleted file mode 100644 index a3217cc..0000000 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/api/commands/ListNiciraNvpDeviceNetworksCmd.java +++ /dev/null @@ -1,111 +0,0 @@ -// -// 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. -// - -package com.cloud.api.commands; - -import java.util.ArrayList; -import java.util.List; - -import javax.inject.Inject; - -import org.apache.log4j.Logger; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ResponseObject.ResponseView; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cloudstack.api.response.NetworkResponse; - -import com.cloud.api.response.NiciraNvpDeviceResponse; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.Network; -import com.cloud.network.element.NiciraNvpElementService; -import com.cloud.utils.exception.CloudRuntimeException; - -@APICommand(name = "listNiciraNvpDeviceNetworks", responseObject = NetworkResponse.class, description = "lists network that are using a nicira nvp device", - requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) -public class ListNiciraNvpDeviceNetworksCmd extends BaseListCmd { - - public static final Logger s_logger = Logger.getLogger(ListNiciraNvpDeviceNetworksCmd.class.getName()); - private static final String s_name = "listniciranvpdevicenetworks"; - @Inject - protected NiciraNvpElementService niciraNvpElementService; - - ///////////////////////////////////////////////////// - //////////////// API parameters ///////////////////// - ///////////////////////////////////////////////////// - - @Parameter(name = ApiConstants.NICIRA_NVP_DEVICE_ID, - type = CommandType.UUID, - entityType = NiciraNvpDeviceResponse.class, - required = true, - description = "nicira nvp device ID") - private Long niciraNvpDeviceId; - - ///////////////////////////////////////////////////// - /////////////////// Accessors /////////////////////// - ///////////////////////////////////////////////////// - - public Long getNiciraNvpDeviceId() { - return niciraNvpDeviceId; - } - - ///////////////////////////////////////////////////// - /////////////// API Implementation/////////////////// - ///////////////////////////////////////////////////// - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException { - try { - List<? extends Network> networks = niciraNvpElementService.listNiciraNvpDeviceNetworks(this); - ListResponse<NetworkResponse> response = new ListResponse<NetworkResponse>(); - List<NetworkResponse> networkResponses = new ArrayList<NetworkResponse>(); - - if (networks != null && !networks.isEmpty()) { - for (Network network : networks) { - NetworkResponse networkResponse = _responseGenerator.createNetworkResponse(ResponseView.Full, network); - networkResponses.add(networkResponse); - } - } - - response.setResponses(networkResponses); - response.setResponseName(getCommandName()); - setResponseObject(response); - } catch (InvalidParameterValueException invalidParamExcp) { - throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); - } catch (CloudRuntimeException runtimeExcp) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); - } - } - - @Override - public String getCommandName() { - return s_name; - } - -}
