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/12/28 11:22:40 UTC
[16/16] git commit: updated refs/heads/master to 67b753c
Merge pull request #1094 from nvazquez/sharedNiciraNVP
CLOUDSTACK-9074: Support shared networking in NiciraNVP PluginJIRA TICKET:
https://issues.apache.org/jira/browse/CLOUDSTACK-9074
Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Support+shared+networking+in+NiciraNVP+Plugin
* pr/1094:
CLOUDSTACK-9074: Move sql to 4.8.0 schema
CLOUDSTACK-9074: Add NetworkGuruAdditionalFunctions license
Use NSX specific config values instead of zone config values
Fix method call bugs when accessign non defined variables
Use helper method to migrate router vm
Add helper method to migrate router vms
Only set L2 Gateway in NSX device if defined
CLOUDSTACK-9074: Marvin tests for NSX Shared Networks Support
CLOUDSTACK-9074: Drop nicira_nvp_router_map unique index on logicalrouter_uuid
CLOUDSTACK-9074: API add Gateway Service Find method
CLOUDSTACK-9074: Support Shared Networks in NiciraNVP Plugin
CLOUDSTACK-9074: New NiciraNVP classes for FindLRouterPort and DeleteLRouterPort API methods
CLOUDSTACK-9074: New NiciraNVP classes to support Shared Networks
CLOUDSTACK-9074: API Changes: Add nsxLogicalSwitch and nsxLogicalSwitchPort to listNics
CLOUDSTACK-9074: API Changes: Add l2gatewayserviceuuid to NVP devices
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/67b753c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67b753c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67b753c1
Branch: refs/heads/master
Commit: 67b753c11bab236187a0a68d92ca8e49cef1b3fd
Parents: 60f0065 de23c94
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Dec 28 11:21:56 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Dec 28 11:21:56 2015 +0100
----------------------------------------------------------------------
.../guru/NetworkGuruAdditionalFunctions.java | 28 ++
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../cloudstack/api/response/NicResponse.java | 16 ++
.../classes/resources/messages.properties | 1 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 8 +-
.../orchestration/NetworkOrchestrator.java | 113 +++++---
.../src/com/cloud/network/dao/NetworkVO.java | 11 +
engine/schema/src/com/cloud/vm/NicVO.java | 23 ++
.../api/ConfigureSharedNetworkUuidAnswer.java | 32 +++
.../api/ConfigureSharedNetworkUuidCommand.java | 85 +++++++
.../api/ConfigureSharedNetworkVlanIdAnswer.java | 31 +++
.../ConfigureSharedNetworkVlanIdCommand.java | 84 ++++++
.../api/DeleteLogicalRouterPortAnswer.java | 31 +++
.../api/DeleteLogicalRouterPortCommand.java | 53 ++++
.../agent/api/FindL2GatewayServiceAnswer.java | 38 +++
.../agent/api/FindL2GatewayServiceCommand.java | 46 ++++
.../agent/api/FindLogicalRouterPortAnswer.java | 38 +++
.../agent/api/FindLogicalRouterPortCommand.java | 59 +++++
.../api/commands/AddNiciraNvpDeviceCmd.java | 10 +
.../api/response/NiciraNvpDeviceResponse.java | 7 +
.../network/dao/NiciraNvpRouterMappingDao.java | 2 +
.../dao/NiciraNvpRouterMappingDaoImpl.java | 9 +
.../cloud/network/element/NiciraNvpElement.java | 86 ++++++-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 129 +++++++++-
.../network/nicira/GatewayServiceConfig.java | 47 ++++
.../network/nicira/L2GatewayAttachment.java | 53 ++++
.../network/nicira/L2GatewayServiceConfig.java | 30 +++
.../cloud/network/nicira/NiciraConstants.java | 3 +
.../com/cloud/network/nicira/NiciraNvpApi.java | 58 ++++-
.../network/nicira/NiciraNvpApiException.java | 25 ++
.../cloud/network/nicira/NiciraRestClient.java | 6 +-
...onfigureSharedNetworkUuidCommandWrapper.java | 196 ++++++++++++++
...figureSharedNetworkVlanIdCommandWrapper.java | 118 +++++++++
...vpDeleteLogicalRouterPortCommandWrapper.java | 59 +++++
...raNvpFindL2GatewayServiceCommandWrapper.java | 69 +++++
...aNvpFindLogicalRouterPortCommandWrapper.java | 68 +++++
.../network/element/NiciraNvpElementTest.java | 213 +++++++++++++++-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 6 +-
server/src/com/cloud/api/ApiResponseHelper.java | 9 +
.../cloud/network/guru/DirectNetworkGuru.java | 3 +-
setup/db/db/schema-461to470.sql | 1 +
setup/db/db/schema-471to480.sql | 2 +
.../plugins/test_nicira_controller.py | 255 +++++++++++++++----
tools/marvin/marvin/lib/base.py | 13 +-
tools/marvin/marvin/lib/common.py | 24 +-
ui/dictionary.jsp | 1 +
ui/scripts/system.js | 21 +-
.../utils/rest/CloudstackRESTException.java | 16 ++
.../cloud/utils/rest/HttpStatusCodeHelper.java | 4 +
.../cloud/utils/rest/RESTServiceConnector.java | 2 +-
50 files changed, 2118 insertions(+), 125 deletions(-)
----------------------------------------------------------------------