b18d90af04
CS-15615: Fix Site2SiteVpnService injection
2012-07-23 14:46:17 -07:00
c357134330
CS-15574: Delete VPN gateway and connection when deleting VPC
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:45:42 -07:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
671475242c
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
Conflicts:
api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
setup/db/create-schema.sql
2012-07-23 14:40:26 -07:00
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
0dec6ea804
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-23 14:35:52 -07:00
830901d7cc
cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).
2012-07-23 14:21:10 -07:00
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
7bef9a961d
Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag
2012-07-23 10:51:20 -07:00
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
65551cff82
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:33:59 -07:00
394f55d9e3
More logging to the VirtualRouter manager
2012-07-20 17:12:34 -07:00
966c1b0ad8
VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
cf895d34d2
CS-15622: always get router info from the DB
2012-07-20 17:12:34 -07:00
2b7ec3f4a8
VPC: one more fix for multiple public nic case for the VPC VR
...
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
5a64d4fbb1
VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
8e648e4a98
Fixed update endpointe.url global config var
2012-07-18 15:47:37 -07:00
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
f2bbf62d9d
Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only.
2012-07-18 14:20:04 -07:00
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -07:00
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00
a3d4ee3d87
VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-16 15:42:36 -07:00
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
829acf6e27
CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator
2012-07-13 16:45:57 -07:00
7a5efcc2e8
CS-15579 - perform check when account/domainId is passed to list call by the regular user
2012-07-13 15:59:15 -07:00
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
4dd71cb635
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:35:18 -07:00
534e6d4d80
VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-07-13 13:35:06 -07:00
d48d4c24e7
VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat
...
Conflicts:
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:34:19 -07:00
ad80f426a0
VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
...
Conflicts:
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:32:14 -07:00
1781f706f9
VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc
2012-07-13 13:27:10 -07:00
b475396438
VPC: CS-15550 - fixed listVPCs by cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 13:26:59 -07:00
eb52f4a610
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-13 13:26:04 -07:00
5923659dba
VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state
2012-07-13 13:25:56 -07:00
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
a848ecae8b
VPC: fixed logging
2012-07-13 13:25:39 -07:00
3d7f6a35ad
CS-15560 : Improve HVM logging of hosts
...
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-13 10:51:56 -07:00
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
Sheng Yang
Jessica Wang
Alena Prokharchyk
bfederle
Chiradeep Vittal
kishan
anthony
Prasanna Santhanam
Hugo Trippaers
Edison Su