You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/18 12:11:21 UTC
[7/7] git commit: updated refs/heads/master to 95ae796
Merge pull request #801 from nlivens/updated-nuage-vsp-plugin
CLOUDSTACK-8832 : Update Nuage VSP plugin to work with Nuage VSP release 3.2
* pr/801:
CLOUDSTACK-8832 : Update Nuage VSP plugin to work with Nuage VSP release 3.2
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/95ae7963
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/95ae7963
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/95ae7963
Branch: refs/heads/master
Commit: 95ae7963d5652595d62d6ace39de2eec9670413c
Parents: 228935d 645f875
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Nov 18 12:09:09 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Nov 18 12:09:09 2015 +0100
----------------------------------------------------------------------
api/src/com/cloud/agent/api/Answer.java | 22 +
api/src/com/cloud/agent/api/Command.java | 20 +
api/src/com/cloud/event/EventTypes.java | 1 +
api/src/com/cloud/network/Network.java | 1 -
client/tomcatconf/commands.properties.in | 1 +
core/src/com/cloud/agent/api/PingCommand.java | 22 +
.../src/com/cloud/network/dao/IPAddressDao.java | 2 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 8 +
.../cloud/network/vpc/NetworkACLItemDao.java | 2 +-
.../com/cloud/network/vpc/VpcOfferingVO.java | 8 +
.../network/vpc/dao/NetworkACLItemDaoImpl.java | 5 +-
plugins/network-elements/nuage-vsp/pom.xml | 7 +
.../src/com/cloud/agent/api/CmdBuilder.java | 24 +
.../cloud/agent/api/PingNuageVspCommand.java | 56 ++
.../com/cloud/agent/api/StartupVspCommand.java | 5 +
.../com/cloud/agent/api/VspResourceAnswer.java | 20 +-
.../com/cloud/agent/api/VspResourceCommand.java | 53 +-
.../api/element/ApplyAclRuleVspAnswer.java | 34 -
.../api/element/ApplyAclRuleVspCommand.java | 195 ++++-
.../api/element/ApplyStaticNatVspAnswer.java | 34 -
.../api/element/ApplyStaticNatVspCommand.java | 104 ++-
.../agent/api/element/ImplementVspCommand.java | 297 ++++++++
.../agent/api/element/ShutDownVpcVspAnswer.java | 34 -
.../api/element/ShutDownVpcVspCommand.java | 63 +-
.../agent/api/guru/DeallocateVmVspAnswer.java | 34 -
.../agent/api/guru/DeallocateVmVspCommand.java | 162 +++-
.../api/guru/ImplementNetworkVspAnswer.java | 35 -
.../api/guru/ImplementNetworkVspCommand.java | 278 ++++++-
.../agent/api/guru/ReleaseVmVspAnswer.java | 34 -
.../agent/api/guru/ReleaseVmVspCommand.java | 54 --
.../api/guru/ReserveVmInterfaceVspAnswer.java | 44 --
.../api/guru/ReserveVmInterfaceVspCommand.java | 327 +++++++-
.../agent/api/guru/TrashNetworkVspAnswer.java | 34 -
.../agent/api/guru/TrashNetworkVspCommand.java | 97 ++-
.../api/manager/GetClientDefaultsAnswer.java | 81 ++
.../api/manager/GetClientDefaultsCommand.java | 38 +
.../api/manager/SupportedApiVersionCommand.java | 61 ++
.../cloud/agent/api/sync/SyncDomainAnswer.java | 57 ++
.../cloud/agent/api/sync/SyncDomainCommand.java | 93 +++
.../agent/api/sync/SyncNuageVspCmsIdAnswer.java | 73 ++
.../api/sync/SyncNuageVspCmsIdCommand.java | 72 ++
.../com/cloud/agent/api/sync/SyncVspAnswer.java | 34 -
.../cloud/agent/api/sync/SyncVspCommand.java | 22 +-
.../api/commands/AddNuageVspDeviceCmd.java | 25 +-
.../api/commands/DeleteNuageVspDeviceCmd.java | 21 +-
.../IssueNuageVspResourceRequestCmd.java | 34 +-
.../api/commands/ListNuageVspDevicesCmd.java | 28 +-
.../api/commands/UpdateNuageVspDeviceCmd.java | 180 +++++
.../api/response/NuageVspDeviceResponse.java | 5 +-
.../api/response/NuageVspResourceResponse.java | 3 +-
.../src/com/cloud/network/NuageVspDeviceVO.java | 5 +-
.../src/com/cloud/network/dao/NuageVspDao.java | 8 +
.../com/cloud/network/dao/NuageVspDaoImpl.java | 20 +-
.../cloud/network/element/NuageVspElement.java | 342 +++++++--
.../network/guru/NuageVspGuestNetworkGuru.java | 512 ++++++++-----
.../cloud/network/manager/NuageVspManager.java | 53 +-
.../network/manager/NuageVspManagerImpl.java | 748 ++++++++++++++++---
.../network/resource/NuageVspResource.java | 543 ++++++++++----
.../cloud/network/sync/NuageVspSyncImpl.java | 35 +-
.../src/com/cloud/util/NuageVspUtil.java | 40 +
.../vsp/acs/NuageVspPluginClientLoader.java | 89 ++-
.../nuage/vsp/acs/client/NuageVspApiClient.java | 10 +-
.../vsp/acs/client/NuageVspElementClient.java | 16 +-
.../vsp/acs/client/NuageVspGuruClient.java | 23 +-
.../vsp/acs/client/NuageVspManagerClient.java | 42 ++
.../vsp/acs/client/NuageVspSyncClient.java | 6 +-
.../test/com/cloud/agent/api/CommandsTest.java | 151 ++++
.../network/element/NuageVspElementTest.java | 137 +++-
.../guru/NuageVspGuestNetworkGuruTest.java | 212 ++++--
.../network/manager/NuageVspManagerTest.java | 37 +-
.../network/resource/NuageVspResourceTest.java | 199 +++--
.../cloud/network/sync/NuageVspSyncTest.java | 23 +-
.../configuration/ConfigurationManagerImpl.java | 7 +-
.../cloud/network/guru/DirectNetworkGuru.java | 6 +-
test/integration/component/test_nuage_vsp.py | 61 +-
.../component/test_vpcnetwork_nuage.py | 295 ++++++++
76 files changed, 5184 insertions(+), 1380 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95ae7963/plugins/network-elements/nuage-vsp/pom.xml
----------------------------------------------------------------------
diff --cc plugins/network-elements/nuage-vsp/pom.xml
index 8dcf833,fb258f8..c1268e4
--- a/plugins/network-elements/nuage-vsp/pom.xml
+++ b/plugins/network-elements/nuage-vsp/pom.xml
@@@ -25,9 -25,16 +25,16 @@@
<parent>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId>
- <version>4.6.0-SNAPSHOT</version>
+ <version>4.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${cs.lang3.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>