634cd78baa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
client/tomcatconf/commands.properties.in
scripts/network/domr/getDomRVersion.sh
scripts/network/domr/ipassoc.sh
scripts/network/domr/l2tp_vpn.sh
scripts/network/domr/networkUsage.sh
scripts/network/domr/router_proxy.sh
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
setup/apidoc/gen_toc.py
setup/db/create-schema.sql
wscript
2012-06-28 17:41:40 -07:00
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
24772bcb4e
VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC
2012-06-28 17:18:15 -07:00
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
46b97cbf7d
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-28 10:25:24 -07:00
308fd39a73
VPC: delete network ACLs as a part of network cleanup
2012-06-28 10:18:23 -07:00
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
cec5012d5a
VPC: fixed ip addres assignment in createLB rule
2012-06-28 10:18:03 -07:00
c8ec262dea
VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls
2012-06-28 10:17:53 -07:00
5ecdad7399
VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-06-28 10:17:34 -07:00
09bd4e1725
VPC: fixed list public ips by vpcId
2012-06-28 10:16:22 -07:00
fcdf6f2bec
Fixed @Implementation for the api commands - responseObject field should be the instance of BaseResponse
...
Conflicts:
api/src/com/cloud/api/commands/UpdateStorageNetworkIpRangeCmd.java
2012-06-28 10:15:43 -07:00
42dac79e08
VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
...
2) Re-apply static routes as a part of VPC VR start
2012-06-28 10:13:48 -07:00
1140f081df
VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes
2012-06-28 10:13:36 -07:00
a78fcedb5e
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
...
Conflicts:
server/src/com/cloud/network/element/NetscalerElement.java
2012-06-28 10:13:19 -07:00
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
66e14e2627
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:48 -07:00
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
8be74c033f
VPC: update ip address object after the ip is associated with the network
2012-06-25 21:00:12 -07:00
96c273ad55
VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics
2012-06-25 21:00:00 -07:00
d35eb73c9b
VPC: initial checkin for Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:59:33 -07:00
83ed35f06b
VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself
2012-06-25 20:58:00 -07:00
b770c8b979
VPC: moved NetworkACL manager to the vpc folder
2012-06-25 20:57:50 -07:00
4e7b65ef71
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 20:57:37 -07:00
4eee9246d8
VPC: added missing @Implementation to listPrivateGateways
2012-06-25 20:57:23 -07:00
dc04e0b2e5
VPC: listPrivateGateways API implementation
2012-06-25 20:57:09 -07:00
11de5d4fbe
Fixed apidoc build
...
Conflicts:
setup/apidoc/gen_toc.py
2012-06-25 20:56:45 -07:00
d3ccc3a7de
VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_
2012-06-25 20:55:37 -07:00
030458a37b
VPC: implemented add/delete Private gateway
...
Conflicts:
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/dc/DataCenterVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-25 20:54:14 -07:00
300110931c
VPC: apply dhcp entries only after all guest nics are plugged
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-25 20:51:09 -07:00
1b1e52ddb0
VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-06-25 20:47:29 -07:00
1a6102be1e
moving LDAP authenticator to plugins/user-authenticators/ldap
2012-06-25 19:30:00 -07:00
974ad65b01
moving out random host allocator to plugins/host-allocators/random/
2012-06-25 18:47:47 -07:00
621f2447bb
Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod
2012-06-25 17:58:45 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
ca8d852409
debian: Remove jnetpcap from the dependency list
2012-06-23 14:31:15 +02:00
5e9a193f2c
agent: Replace tabs by 4 spaces
...
A lot of old code still has tabs inspead of 4 spaces for indentation.
The Coding Convention requires spaces, so we correct it.
2012-06-23 11:16:16 +02:00
d630fa8697
license header changes for scripts folder from Chip Childers
2012-06-23 00:58:00 -04:00
6ed90df654
merging vmware-base license header updates from Chip Childers
2012-06-23 00:40:01 -04:00
3ee3e4122a
cloudstack 3.0 UI - add zone wizard - (1) When sdn.ovs.controller is true and when the physical network is in Advanced zone, show isolation method dropdown with two options (VLAN, GRE). VLAN is the default option in the dropdown.
...
(2) When sdn.ovs.controller is false: hide isolation method dropdown. isolationmethods parameter won’t be passed to createPhysicalNetwork API.
(3) When the physical network is in Basic zone (regardless of sdn.ovs.controller) : hide isolation method dropdown. isolationmethods parameter won’t be passed to createPhysicalNetwork API.
2012-06-22 16:07:12 -07:00
361ca9643d
CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster
...
Description:
Restricting association of a Cisco Nexus VSM to a single
cluster.
2012-06-22 13:31:56 -07:00
8dd4197cd8
From: Jason Bausewein [jason.bausewein@tier3.com]
...
I would like to add an command line option to choose between advanced or basic networking configuration. This would allow me or others to choose advanced networking without having to edit the python code.
2012-06-22 13:19:04 -07:00
e38db69434
remove tools/testClient as they are moved to tools/marvin/marvin already
2012-06-22 10:57:53 -07:00
e442e3a7cf
CS-12478: Add cluster name to primary storage list view
...
Original patch by: olga.smola
reviewed-by: brian
2012-06-22 10:50:04 -07:00
2f38e1c713
From:Jason Bausewein [jason.bausewein@tier3.com]
...
I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts
2012-06-22 10:23:03 -07:00
356ab7b013
From:Jason Bausewein [jason.bausewein@tier3.com]
...
I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts
2012-06-22 10:21:09 -07:00
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
99ee0ba9a3
adding back the unintended deleting of file build/build-cloud.properties
2012-06-21 14:45:43 -07:00
5697ff2baf
CS-15181: Remove stale global config parameters from upgrade script
...
Description:
Removing stale global config params.
2012-06-21 13:55:52 -07:00
Alena Prokharchyk
Murali reddy
Wido den Hollander
David Nalley
Jessica Wang
Vijayendra Bhamidipati
Edison Su
bfederle