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
chip.childers@gmail.com
827943a865
Initial commit converting the devcloud build
...
process to being based on puppet and vagrant.
2012-07-19 04:12:19 -04:00
Alena Prokharchyk
8e648e4a98
Fixed update endpointe.url global config var
2012-07-18 15:47:37 -07:00
Alena Prokharchyk
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
kishan
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
chip.childers@gmail.com
03eab4d947
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-18 07:30:52 -04:00
Alena Prokharchyk
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -07:00
Sheng Yang
a1333649db
CS-15536: Insert VPN mangle policy to FORWARD and OUTPUT
...
In order to get traffic tagged while ACL chain involved in PREROUTING chain.
Also using more generic tag checking in nat table.
2012-07-17 17:23:11 -07:00
Alena Prokharchyk
14fa5279e2
Merge branch 'master' into vpc
2012-07-17 17:12:17 -07:00
Alena Prokharchyk
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
Alena Prokharchyk
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
bfederle
2b2e491f27
CS-15572: Fix page index for list view filters
...
This fixes an issue where the page index is not reset back 1 when
activating the search or filter functionality, causing truncation when
trying to scroll down to later pages.
2012-07-17 11:41:53 -07:00
Edison Su
dfb0eed5a4
fix ubuntu 12.04 build
2012-07-16 18:00:05 -07:00
kishan
88205a7a83
Added ant target deploy-server-encrypt to enable encryption in dev setup
2012-07-16 16:11:44 -07:00
kishan
09e4b1683f
Added ant target deploy-server-encrypt to enable encryption in dev setup
2012-07-16 16:11:44 -07:00
Alena Prokharchyk
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
Alena Prokharchyk
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
Alena Prokharchyk
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00