Alena Prokharchyk
aaf0d24a83
Merge branch 'vpc-3.0.x' into 3.0.x
...
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/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
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/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
setup/db/create-schema.sql
wscript
2012-06-14 19:04:59 -07:00
Alena Prokharchyk
f1738e1e2e
Changed the command name for adding private gateway
2012-06-14 17:47:43 -07:00
Jessica Wang
11b7675193
CS-15157: cloudstack 3.0 UI - infrastructure page - physical network - network service providers - reset nspMap before populating listNetworkServiceProviders response to nspMap.
2012-06-14 17:28:12 -07:00
Alena Prokharchyk
0b5ed6ef57
Api docs: added category for resource tags commands
2012-06-14 15:26:27 -07:00
Alena Prokharchyk
5c5a2adb90
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-14 15:17:11 -07:00
Edison Su
402ee953b2
CS-14826
...
fix typo
Reviewed-by: sheng
2012-06-14 14:04:33 -07:00
Brian Federle
a9d1d13878
CS-14230
...
Add password confirm to add account/user forms
Original patch by: oyla.smola@gmail.com
Reviewed-by: brian
2012-06-14 11:34:10 -07:00
Prasanna Santhanam
09e7ab0c7e
Implementing the SetFirewallRulesCommand for the simulator
...
* Essential since we need firewall rules open before applying network
rules. Without the fix one recieves an UnsupportedCommandAnswer and
fails the application of the network rule
* Also RebootCommand responds with a RebootAnswer - minor fix
2012-06-14 12:24:47 +05:30
anthony
d83c81b637
VPC : fixed get_domr_version
2012-06-13 19:25:48 -07:00
Jessica Wang
8ad831e691
CS-14604: cloudstack 3.0 UI - Add Zone Wizard - (1) Basic zone: always show Guest Traffic step regardless of whether OVS tunnel manager is enabled. (2) Advanced zone: skip Guest Traffic step if OVS tunnel manager is enabled.
2012-06-13 17:55:49 -07:00
Alena Prokharchyk
127daa5831
Fixed lock problem when add vm to guest network
2012-06-13 16:43:43 -07:00
anthony
8f4ccf9f72
VPC : revert dnsmasq.conf
2012-06-13 15:48:58 -07:00
Alena Prokharchyk
2412b7837d
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-13 14:56:04 -07:00
Jessica Wang
7d6528b21d
CS-14604: cloudstack 3.0 UI - Add Zone Wizard - skip Guest Traffic step if OVS tunnel manager is enabled.
2012-06-13 14:40:17 -07:00
Pranav Saxena
ce6b50b3d6
CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v
2012-06-13 11:21:01 -07:00
Alena Prokharchyk
a5f0b64562
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-13 10:17:48 -07:00
Chirag Jog
17978438ee
Adding Netscaler test cases and fixing bugs in HA test suite.
2012-06-13 20:34:14 +05:30
anthony
d3720c988b
VPC : add vpc_vpn_l2tp.sh
2012-06-12 17:09:50 -07:00
Kelven Yang
93530c60be
1) Fix Console viewer CTRL key problem on Chrome browser
...
2) Support mouse drag/drop
2012-06-12 15:53:43 -07:00
anthony
4075963767
VPC : revert some change
2012-06-12 15:33:01 -07:00
Alena Prokharchyk
39efa6cd2e
Temporarely disabling resource tags commands until gen_toc.py is fixed.
2012-06-12 14:12:07 -07:00
Jessica Wang
286d7b061d
cloudstack 3.0 UI - account page - fix a bug that happens when account name includes ampersand or other special characters. Encode account name before it's being passed to API calls.
2012-06-12 13:58:15 -07:00
Alena Prokharchyk
4ded9c173e
Fixed build-apidocs
2012-06-12 13:48:34 -07:00
Alena Prokharchyk
97ca76856a
VPC: more changes to ipAssoc
2012-06-12 13:35:15 -07:00
anthony
91363d555e
VPC : fix nic hot plug script
2012-06-12 12:26:31 -07:00
anthony
7e463932f0
VPC : add nic hot plug script
2012-06-12 11:56:12 -07:00
Alena Prokharchyk
c40839599c
Initial checkin for resource tags feature
2012-06-12 10:59:56 -07:00
Alena Prokharchyk
9c01ca2785
VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip)
2012-06-12 10:58:20 -07:00
anthony
372582ca6b
VPC : vpc_ipassosc.sh
2012-06-11 19:07:36 -07:00
anthony
389833dfe7
VPC : add new dnsmasq.conf for VPC domr
2012-06-11 18:08:37 -07:00
anthony
c854cb04e5
VPC : add new type vpcrouter in cloud-early-config
2012-06-11 18:00:06 -07:00
anthony
28335a0ffb
VPC : revert iptables-router
2012-06-11 17:44:26 -07:00
anthony
196be6f5fa
VPC : revert change in cloud-early-config
2012-06-11 17:41:26 -07:00
anthony
99385d7c38
VPC : add new ipassoc.sh for vpc
2012-06-11 17:37:37 -07:00
anthony
00278191bb
VPC : revert changes in ipassoc.sh
2012-06-11 17:35:37 -07:00
anthony
8712199cfd
VPC : bug fix
2012-06-11 17:15:16 -07:00
Alena Prokharchyk
914b5fa981
Fixed ip assoc
2012-06-11 17:01:09 -07:00
Vijayendra Bhamidipati
eb2d05c6c6
CS-15241: static NAT is not working when provider is set to Juniper SRX
...
Description:
Checking in fix for the exception seen due to the absence of
the AsyncCommandQueued exception in the map of CSExceptionErrorCode
which is used to look up the error code corresponding to a
cloudstack exception. Also printing the stack trace in case
an exception is not found in the map.
2012-06-11 16:36:02 -07:00
Alena Prokharchyk
287ebd350d
More logging to plug nic code
2012-06-11 15:58:26 -07:00
Brian Federle
5528cdd954
Update breadcrumb hover effect
...
-Use 1s interval (instead of 2s) until showing panel
-Use .fadeOut on panel focus, for smoother transition
2012-06-11 15:12:57 -07:00
Alena Prokharchyk
07be6918d8
VPC: fixed guest network shutdown
2012-06-11 15:01:51 -07:00
Alena Prokharchyk
d1598e366e
Release acquired lock for VPC
2012-06-11 14:31:39 -07:00
Alena Prokharchyk
3b943d84dd
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-11 13:37:38 -07:00
Brian Federle
d7f00f2c45
CS-14877: Focus browser panel on breadcrumb hover
...
When mouse is over a breadcrumb for a period of > 2s, show its
respective panel until mouseout. This allows a user to see the
contents of the panel without having to select it.
reviewed-by: brian
Original commit:
commit 88be929e04826cd1159a2db7dbca220f7eadf5fd
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date: Fri Jun 8 14:17:42 2012 +0530
CS-14877: Expanded breadcrumb navigation on hover UI Requirement
2012-06-11 12:52:10 -07:00
bfederle
7b9b3c1e1d
CS-14010
...
Add 'about' dialog to the CloudStack top header, showing current verison
information.
Patch submitted by: oyla.smola@gmail.com
Reviewed-by: brian
2012-06-11 11:11:20 -07:00
Alena Prokharchyk
ebbbb3b343
Fixed create-schema.sql
2012-06-11 09:41:40 -07:00
Alena Prokharchyk
cf1882a2c8
1) Added VpcVirtualNetworkApplianceService interface
...
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
2012-06-10 12:31:47 -07:00
Edison Su
49a6d37e80
bug 13733: fix vm after reboot can't get ipaddress; status 13733: resolved fixed. Reviewed-by: Chiradeep
2012-06-07 21:37:41 -07:00
anthony
52d93071c8
VPC : bug fix
2012-06-07 19:10:20 -07:00
anthony
a159255e36
VPC : many debug fix
2012-06-07 17:53:12 -07:00