Sheng Yang
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
Sheng Yang
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
Sheng Yang
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
Sheng Yang
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
Sheng Yang
52c145dc46
CS-15470: Remove UNIQUE keyword for some fields
...
User can create/delete/create gateway again and again, then it would no longer
be unique. The unique should be guaranteed by API level.
2012-07-23 14:36:22 -07:00
Sheng Yang
4b0515f8e5
CS-15471: Fix wrong type of updating customer gateway lifetime
...
Also fixes one typo.
2012-07-23 14:36:10 -07:00
Sheng Yang
0dec6ea804
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-23 14:35:52 -07:00
Sheng Yang
d855dff7c2
CS-6840: Fix wrong path of check s2s vpn script
2012-07-23 14:35:32 -07:00
Jessica Wang
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
Jessica Wang
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
Pranav Saxena
dade14aab1
CS-15540: Shared Networks IPs in Advanced Zone appear as 'Direct IP' in System-Wide-Capacity Dashboard
2012-07-24 01:25:05 +05:30
Pranav Saxena
018a243ca1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-24 00:52:22 +05:30
Jessica Wang
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
Jessica Wang
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
Jessica Wang
497c324efc
cloudstack 3.0 API - CreateVpnCustomerGateway API: correct parameter type on server-side.
2012-07-23 11:35:48 -07:00
Likitha Shetty
c60e4b4a9e
Adding support in AWSAPI for CloudStack API's that implement the tags feature.
...
Verified the output of,
1. ec2-create-tags for all 4 supported ec2 resources(image, instance, volume and snapshot) with and without tag-value.
2. ec2-delete-tags for all types of created tags.
3. ec2-describe-tags with and without all supported filter.
2012-07-23 11:31:17 -07:00
Alena Prokharchyk
9e5fb17e3d
CS-15077: fixed listPublicIpAddresses in basic zone
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-23 11:21:28 -07:00
Alena Prokharchyk
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
Alena Prokharchyk
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
bfederle
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
Alena Prokharchyk
65551cff82
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:33:59 -07:00
Edison Su
4c6e547e70
create devcloud base image from veewee
2012-07-20 18:20:31 -07:00
Alena Prokharchyk
394f55d9e3
More logging to the VirtualRouter manager
2012-07-20 17:12:34 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
cf895d34d2
CS-15622: always get router info from the DB
2012-07-20 17:12:34 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
Jessica Wang
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
Alena Prokharchyk
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
Jessica Wang
2a822de5e0
cloudstack 3.0 UI - multiEdit widget - make headerFields hidden as default.
2012-07-20 16:13:03 -07:00
Jessica Wang
f3841b3b8f
cloudstack 3.0 UI - VPC - add LB rule - fix a JS error "args.context.networks is undefined" when configure stickiness.
2012-07-20 16:10:35 -07:00
Jessica Wang
1381fa46e1
cloudstack 3.0 UI - listView widget - pass context from caller function.
2012-07-20 16:05:11 -07:00
Jessica Wang
9176d13246
cloudstack 3.0 UI - VPC - infrasture page - network service providers - add "VPC Virtual Router".
2012-07-20 15:59:05 -07:00
Jessica Wang
254c05813c
cloudstack 3.0 UI - VPC - add zone wizard - enable VpcVirtualRouter element, enable VpcVirtualRouter provider for advanced zone.
2012-07-20 15:49:13 -07:00
Jessica Wang
dc847ed832
cloudstack 3.0 UI - VPC - tier - implement "Add VM to tier" action.
2012-07-20 15:44:45 -07:00
Jessica Wang
20db2e515b
cloudstack 3.0 UI - VPC - add network offering dialog - when service(s) has VPC Virtual Router as provider: (1) conserve mode is set to unchecked and grayed out. (2) redundant router capability checkbox is set to unchecked and grayed out. (3) remove Firewall service, SecurityGroup service.
2012-07-20 14:28:20 -07:00
Jessica Wang
ee9074a175
cloudstack 3.0 UI - VPC - sync VPC UI from citrix-hosted repo to apache-hosted repo.
2012-07-20 14:12:53 -07:00
Brian Federle
152b17b7f3
Remove dummy VPC UI from networks section
2012-07-20 14:05:44 -07:00
David Nalley
67bc9c819a
fixing some more license headers
2012-07-20 15:59:31 -04:00
David Nalley
2f6cef6402
fixing license statement in debian
2012-07-20 14:09:16 -04:00
David Nalley
7c62865090
additional copy of license not needed
2012-07-20 14:07:32 -04:00
bfederle
71bfeae487
Update VPC UI
2012-07-20 11:02:28 -07:00
David Nalley
385f2e7923
cleaning up a few last license headers in client
2012-07-20 14:02:24 -04:00
David Nalley
bacb50d1ba
cleaning up last license headers in build
2012-07-20 13:58:48 -04:00
Sheng Yang
e9ae7336c1
CS-15649: Remove DES from s2s vpn support policy
...
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
David Nalley
50da77c63f
cleaning up one remaining license header issue in api
2012-07-20 13:51:56 -04:00
David Nalley
3631e7a1d2
cleaning up some last license header files in agent-simulator
2012-07-20 13:49:56 -04:00
Chiradeep Vittal
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
Sheng Yang
c0fcca3990
CS-15511: Not allow pfs parameter for customer VPN gateway
2012-07-19 15:10:31 -07:00
Wido den Hollander
44f289e0a6
debian: Do not depend on the cloud-daemonize package
...
We are in the process of removing this from all packages and files
2012-07-19 13:35:27 +02:00