Commit Graph

268 Commits

Author SHA1 Message Date
Koushik Das 0232048f90 Merge branch 'master' into cisco-vnmc-api-integration
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	setup/db/db/schema-410to420.sql
	tools/marvin/marvin/integration/lib/base.py
2013-04-15 17:05:59 +05:30
Koushik Das 735c4c8955 Fixed unit tests based on recent changes in the Vnmc resource code 2013-04-15 15:20:37 +05:30
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
2013-04-14 17:50:15 +05:30
Pascal Borreli 20614598bf Fixed typos
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
Jayapal a4a059c043 CLOUDSTACK-779 Egress firewall rules support for Juniper SRX 2013-04-10 10:54:04 -07:00
Koushik Das f38be4810e Removed unwanted files 2013-04-08 18:42:06 +05:30
Hugo Trippaers f09d981c3e Switching netscaler to the maven location of the
netscaler.nitro jar.

If it's there we might as well use it.

This fixes build problems for people with old netscaler jars as the
version was not updated in the jar.
2013-04-08 12:34:57 +02:00
Koushik Das 67f11d46ad Merge branch 'master' into cisco-vnmc-api-integration 2013-04-08 15:11:10 +05:30
Koushik Das 3422ceefb6 Correctly associating nat, acl policy sets to edge security profile in VNMC 2013-04-08 14:42:32 +05:30
Koushik Das 9c1e193fca Passing correct subnet mask while creating edge firewall in VNMC 2013-04-07 21:22:22 +05:30
Chip Childers 4f9bdba281 Correcting missing license headers in two MidoNet plugin files
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-03 20:33:25 +01:00
Brian Spindler 469c4dd139 Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-04 00:53:20 +05:30
Dave Cahill eddf7b9357 MidoNet Networking Plugin
- Supports DHCP, Source NAT, Static NAT, Firewall rules, Port Forwarding
- Renamed MidokuraMidonet to MidoNet
- Related Jira ticket is CLOUDSTACK-996

Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:11 +02:00
Dave Cahill d392445f7e Rename MidoNetElement and MidoNetGuestNetworkGuru
- Creating this as a separate commit so that it is marked as a rename
- Over 50% code changed, so would count as a delete and add otherwise

Signed-off-by: Dave Cahill <dcahill@midokura.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-04-03 12:03:05 +02:00
Koushik Das 05e3d04b55 Added changes related to icmp 2013-04-02 17:50:57 +05:30
Koushik Das bcecb589de Some xml file renames 2013-04-01 13:57:21 +05:30
Koushik Das 9c1ee93f2e Fixed PF and static NAT rule creation in VNMC 2013-03-30 15:54:25 +05:30
Kanzhe Jiang ee3fd18435 BigSwitch networking plugin update
Update BigSwitch Plugin:

. UI support for adding BigSwitch controller as a network service provider
. Correct the message format between the plugin and the controller
. Add Health check API

Test to add a BigSwitch controller as a network service provider and view.
Test to implementation of guest network on the controller
Test to associate VM to its guest network
2013-03-29 18:54:48 +05:30
Koushik Das 7e6159fa05 Added more unit tests for Cisco Vnmc element 2013-03-27 18:53:49 +05:30
Murali Reddy c5fb8349bf CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load
Balancing) capability for ELB service

merging GSLB feature
2013-03-27 17:54:07 +05:30
Koushik Das fc0ed9adb6 Cleaning up VNMC config as part of network shutdown 2013-03-27 16:48:28 +05:30
Funs Kessen 99ea4011b1 Removing baremetal related references
Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-03-27 15:56:13 +05:30
Koushik Das 5a427d48e2 Added unit test for Vnmc network element implement() method 2013-03-27 02:22:54 +05:30
Koushik Das 4d2168bfa9 Egress firewall rule 2013-03-22 00:30:01 +05:30
Vijay venkatachalam 61d8dde033 CLOUDSTACK-1537. Fixing Network Restart case for AutoScale 2013-03-21 16:59:15 +00:00
Koushik Das e81ab3a2f4 More tests for VnmcResource class 2013-03-21 10:50:29 +05:30
Koushik Das f0c1af2b5c Merge branch 'master' into cisco-vnmc-api-integration
Conflicts:
	api/src/com/cloud/network/Network.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	client/tomcatconf/components-nonoss.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	setup/db/db/schema-410to420.sql
	vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
2013-03-20 16:20:10 +05:30
Koushik Das 4f305c2beb Initial set of tests, will add more in subsequent commits 2013-03-20 15:09:34 +05:30
Rajesh Battala 183b989d30 CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful 2013-03-18 14:01:15 +05:30
Koushik Das 387545caff Added license headers to XML files 2013-03-16 11:14:43 +05:30
Murali Reddy 2feda05ecd CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with
Netscaler

There is no need for getIpDeployer to depend on the fact a NetScaler
device is allocated (network is implemented state) or not-allocated
(network is in shutdown state)
2013-03-13 17:30:15 +05:30
Koushik Das 43e2997421 Changes related to instantiating the dao components 2013-03-13 11:51:59 +05:30
Koushik Das 99e88ecbf9 Fix build errors after merge from master 2013-03-12 23:40:35 +05:30
Koushik Das 7c20b120c2 Fixing poms and other xmls 2013-03-12 23:31:46 +05:30
Koushik Das ee868759a8 Merge branch 'master' into cisco-vnmc-api-integration
Conflicts:
	api/src/com/cloud/network/Network.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	plugins/pom.xml
	setup/db/create-schema.sql
2013-03-12 14:44:59 +05:30
Koushik Das 9c94b6d231 Fixed XML to create static route in VNMC correctly 2013-03-08 22:20:23 +05:30
Koushik Das ef069b3323 Added logic for revoking ACL, PF and Static NAT rules 2013-03-08 15:26:26 +05:30
Koushik Das 4c65b70668 Renamed delete-acl-rule -> delete-rule 2013-03-08 13:51:37 +05:30
Koushik Das aa94eca516 - Creating static routes in VNMC as part of edge firewall configuration
- Passing order parameter while creating rules so that they are evaluated in a specific order
- Added methods in VnmcResource for listing acl policies and rules belonging to variouos policies. This is used to compute order while creation of various rules in VNMC
2013-03-08 00:38:52 +05:30
Koushik Das cc824e8585 Adding appropriate ACL rules for PF and static NAT 2013-03-07 12:16:29 +05:30
Koushik Das fb23c50365 Added logic for deleting various VNMC artifacts. Added/updated relevant xmls as well. 2013-03-01 17:21:45 +05:30
Koushik Das 970c21a9a3 Added implementation for delete of asa and vnmc apis 2013-03-01 01:54:10 +05:30
Koushik Das 22e1455142 List asa api to return guest network if associated. From this it can be inferred if asa is available or not 2013-03-01 01:19:43 +05:30
Koushik Das 32223736c9 Added Vmware cluster info along with asa1kv appliance.
This is used to select the correct n1kv vsm for configuring the guest network
2013-03-01 00:50:55 +05:30
Koushik Das deed3cc951 Added support for static NAT rules.
- Xmls for creating static nat rules in VNMC
- applyStaticNats implementation in VNMC network element
- handler for static nat in resource class
2013-02-25 18:03:59 +05:30
Koushik Das 681f0b7b50 Added implementation for firewall and port forwarding rules in Cisco VNMC element class 2013-02-25 10:44:13 +05:30
Koushik Das 66b01a6589 VNMC xml for deleting NAT policy 2013-02-22 19:19:44 +05:30
Koushik Das 5d98686768 Added support for PF/DNAT rules.
Created methods in VNMCConnection class to create PF rules. Also moved out common code for PF and source NAT in methods.
Updated the corresponding VNMC resource class.
2013-02-22 19:16:41 +05:30
Koushik Das 8db2fbeb8f Added xml for creating NAT policy set in VNMC 2013-02-22 18:21:45 +05:30
Koushik Das f2da0d50ca Added VNMC XMLs for supporting PF/DNAT rules.
Also moved out some XMLs related to source NAT to common files so that these can be used for both source NAT and DNAT
2013-02-22 18:17:53 +05:30