You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/10/12 14:15:51 UTC
[1/16] git commit: Merge branch 'nicira-l3support'
Updated Branches:
refs/heads/master c86c5d2cc -> c07d6d28e
Merge branch 'nicira-l3support'
This commit merges the nicira-l3support branch with master. This
effectively adds nicira nvp l3 support to master. The NiciraNVP Provider
can support the following services with this modification: Connectivity,
SourceNat, StaticNat and PortForwarding
Testing done:
Create, Delete network offerings with Nicira Element
Use Gui to add, modify, remove Nicira Element and Provider
Provision, deprovision SourceNat networks
Provision, deprovision Portforwarding and StaticNat rules
Tested with Nicira NVP release 2.1.0, 2.2.0 and 2.2.1 (2.2.x recommended)
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c07d6d28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c07d6d28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c07d6d28
Branch: refs/heads/master
Commit: c07d6d28ee9f7878e2953bd7f4c55370f498bf66
Parents: c86c5d2 51f9a98
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Oct 12 14:14:58 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Oct 12 14:15:17 2012 +0200
----------------------------------------------------------------------
api/src/com/cloud/api/ApiConstants.java | 1 +
api/src/com/cloud/event/EventTypes.java | 5 +
.../WEB-INF/classes/resources/messages.properties | 7 +
client/tomcatconf/components.xml.in | 1 +
...rePortForwardingRulesOnLogicalRouterAnswer.java | 34 +
...ePortForwardingRulesOnLogicalRouterCommand.java | 60 +
.../ConfigurePublicIpsOnLogicalRouterAnswer.java | 14 +
.../ConfigurePublicIpsOnLogicalRouterCommand.java | 49 +
...nfigureStaticNatRulesOnLogicalRouterAnswer.java | 43 +
...figureStaticNatRulesOnLogicalRouterCommand.java | 63 +
.../cloud/agent/api/CreateLogicalRouterAnswer.java | 40 +
.../agent/api/CreateLogicalRouterCommand.java | 115 ++
.../cloud/agent/api/DeleteLogicalRouterAnswer.java | 32 +
.../agent/api/DeleteLogicalRouterCommand.java | 41 +
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 21 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 16 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 2 +-
.../api/response/NiciraNvpDeviceResponse.java | 33 +-
.../cloud/network/NiciraNvpRouterMappingVO.java | 79 +
.../network/dao/NiciraNvpRouterMappingDao.java | 9 +
.../network/dao/NiciraNvpRouterMappingDaoImpl.java | 30 +
.../cloud/network/element/NiciraNvpElement.java | 1255 ++++++++++-----
.../cloud/network/nicira/DestinationNatRule.java | 8 +
.../cloud/network/nicira/L3GatewayAttachment.java | 52 +
.../cloud/network/nicira/LogicalRouterConfig.java | 64 +
.../cloud/network/nicira/LogicalRouterPort.java | 90 +
.../src/com/cloud/network/nicira/Match.java | 133 ++
.../src/com/cloud/network/nicira/NatRule.java | 113 ++
.../src/com/cloud/network/nicira/NiciraNvpApi.java | 114 ++-
.../com/cloud/network/nicira/NiciraNvpList.java | 10 +-
.../com/cloud/network/nicira/PatchAttachment.java | 39 +
.../com/cloud/network/nicira/RouterNextHop.java | 38 +
.../com/cloud/network/nicira/RoutingConfig.java | 5 +
.../SingleDefaultRouteImplictRoutingConfig.java | 38 +
.../com/cloud/network/nicira/SourceNatRule.java | 27 +
.../cloud/network/resource/NiciraNvpResource.java | 492 ++++++-
setup/db/create-schema.sql | 9 +
ui/dictionary.jsp | 7 +-
ui/scripts/configuration.js | 1 +
ui/scripts/system.js | 418 +++++-
40 files changed, 3171 insertions(+), 437 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c07d6d28/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c07d6d28/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --cc setup/db/create-schema.sql
index 302eadb,53e5f08..acbbc41
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@@ -2371,4 -2371,13 +2372,12 @@@ CREATE TABLE `cloud`.`nicira_nvp_nic_ma
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+ CREATE TABLE `cloud`.`nicira_nvp_router_map` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `logicalrouter_uuid` varchar(255) NOT NULL UNIQUE COMMENT 'nicira uuid of logical router',
+ `network_id` bigint unsigned NOT NULL UNIQUE COMMENT 'cloudstack id of the network',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_nicira_nvp_router_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
SET foreign_key_checks = 1;
-
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c07d6d28/ui/dictionary.jsp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c07d6d28/ui/scripts/system.js
----------------------------------------------------------------------