Commit Graph

11672 Commits

Author SHA1 Message Date
bfederle aeec7dde11 Firefox CSS fix
Explicitly hide overflow-x, to prevent breakage from Firefox 12 update
causing horizontal scrollbars to be visible.
2012-04-25 11:30:46 -07:00
Alena Prokharchyk 1c9af77f59 Set ha host to false when no ha tag is enabled 2012-04-25 11:04:07 -07:00
Salvatore Orlando fc3eaad0c6 CS-14605: OVS cleanup
DB scripts cleanup
2012-04-25 18:11:04 +01:00
Salvatore Orlando e947f37d7c CS-14605: OVS cleanup
pep8 fixes to python scripts
removing superflous/unused code from python scripts
2012-04-25 18:10:51 +01:00
Salvatore Orlando 88131e5db6 CS-14605: OVS cleanup
Fix syntax errors in ConfigurationManager and Resource Manager test

Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
	server/test/com/cloud/agent/manager/ResourceManagerTest.java
2012-04-25 15:11:05 +01:00
Salvatore Orlando 33a2b17972 CS-14605: OVS Tunnel Manager Clean-up
1) Remove old VLAN-in-overlay manager
2) Remove unused DAO objects
3) Fix code using removed object (all stale lines)

Conflicts:

	server/src/com/cloud/network/ovs/GreTunnelException.java
	server/src/com/cloud/network/ovs/OvsVlanExhaustedException.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountDao.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountDaoImpl.java
	server/src/com/cloud/network/ovs/dao/OvsTunnelAccountVO.java
2012-04-25 15:03:47 +01:00
Salvatore Orlando f7836ba61c Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-04-25 09:50:48 +01:00
Alena Prokharchyk 4e3bdb62d2 Account specific vlan ranges - fixed deleteVlanRange
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 17:16:58 -07:00
Jessica Wang 8962194f42 CS-14385: cloudstack UI - Host page - add "HA Enabled" column which only shows When ha.tag global configuration is not empty. 2012-04-24 17:06:04 -07:00
Jessica Wang c4719e91f5 CS-14624: cloudstack 3.0 UI - hide "Add Account" button from domain-admin. 2012-04-24 17:06:03 -07:00
Kelven Yang 25611c50a3 bug 14090: handle the case when command is sent to a different host that is not owner of the VM 2012-04-24 16:45:02 -07:00
Sheng Yang 154c7d385f CS-14618: Fix null network device name
The bug is introduced by:

    commit 708472e1ef
    Author: Edison Su <sudison@gmail.com>
    Date:   Tue Mar 20 16:49:47 2012 -0700

        bug 14322: support multiple physical nic in kvm
        status 14322: resolved fixed

The above commit cover the case of creating vif without a nic name, but didn't
cover the migration case.
2012-04-24 16:16:37 -07:00
Alena Prokharchyk 319d4c5cfd Catch all exceptions when change engine and row_format - can fail when table is full. Just skip as its not a critical fix 2012-04-24 15:49:14 -07:00
Salvatore Orlando 8779f0ed25 CS-14270: return VLAN id only if the broadcast URI starts with 'vlan' 2012-04-24 21:34:10 +01:00
Jessica Wang 21ebf03ea1 cloudstack 3.0 UI - infrastructure page - guest traffic type - network tab - fix a bug that clicking a network that doesn't belong to current login user would show spinning wheel forever in detailView. 2012-04-24 12:14:15 -07:00
Jessica Wang 37007f8071 CS-14297: cloudstack 3.0 UI - Delete Primary Storage dialogbox - add "Force Remove" checkbox. 2012-04-24 11:49:53 -07:00
Alena Prokharchyk ccd0472201 CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 11:42:53 -07:00
Jessica Wang fc4f77cb85 cloudstack 3.0.x UI - checked in Japanese translation file provided by Tetsunori 2012-04-24 11:29:38 -07:00
anthony f0a4044d29 add CentOS 6.0, CentOS 5.7, RHEL 5.7 support for XenServer 6.0.2 2012-04-24 10:50:34 -07:00
Jessica Wang f78874d825 CS-12407: cloudstack 3.0 UI - Add F5 device - when Dedicated checkbox is checked, hide Capacity field and pass "capacity=1" to API. 2012-04-24 10:50:53 -07:00
Salvatore Orlando 56d496ac60 CS-14619: Add missing INSERT statements 2012-04-24 15:58:57 +01:00
Salvatore Orlando ef13158c2b CS-14437: Fixing remaining merge issues affecting tunnel creation
Tunnel networks now work on this branch
(VLAN networks never stopped working)
2012-04-24 15:21:41 +01:00
Salvatore Orlando 5c58aeaa04 CS-14613: syntax error in create-schema.sql for 3.0.x 2012-04-24 10:34:12 +01:00
Sheng Yang 182a4cf2e9 CS-14555: Calculated checksum before unzip
Otherwise checksum would be overrided by wrong value.
2012-04-23 19:01:36 -07:00
Salvatore Orlando 48b6236c64 Fixing merge issues for OVS tunnel manager 2012-04-24 02:22:10 +01:00
Salvatore Orlando 531fbcf1ee Fixing further issue with conflict resolution 2012-04-24 02:20:48 +01:00
Salvatore Orlando 0cdfa7f943 Removing connectivity from service provider list 2012-04-24 02:20:39 +01:00
Salvatore Orlando 6f3ab6de5d Removing basic connectivity provider and OVS network offering as not
needed for Bonita
2012-04-24 02:20:39 +01:00
Salvatore Orlando 2459b16b81 Adding ovs_tunnel_interface to schema;
adding new tables to update script (3.0.2 to 3.0.3)

Conflicts:

	setup/db/db/schema-2214to30.sql
	setup/db/db/schema-302to303.sql
2012-04-24 02:20:39 +01:00
Salvatore Orlando fbd5edc2e3 Fix conflict resolution errors
Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:39 +01:00
Salvatore Orlando 421862216e Now finding the IP address also for the remote endpoint
Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:39 +01:00
Salvatore Orlando 1ddcdb25c1 Forgot to add new dao into component library! 2012-04-24 02:20:39 +01:00
Salvatore Orlando cc344ad038 Adding DB support for interfaces OVS tunnel manager will use as GRE endpoints
Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando 24a567ac43 Removing superfluous log statements 2012-04-24 02:20:38 +01:00
Salvatore Orlando 275840bcdb Now using vnets instead of network id for creating networks
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands

Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando 2f9c4d1e39 Adding Missing file to source control 2012-04-24 02:20:38 +01:00
Salvatore Orlando 5cdd19152a Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master
2012-04-24 02:20:38 +01:00
Salvatore Orlando 6ef2e6d91b Overwriting ovstunnel 2012-04-24 02:20:38 +01:00
Salvatore Orlando 2d12cfbc87 Fixing remaining issues with per-VIF flow script and removing version-specific scripts.
Now generating XSnetwork names using gre keys

Plus other minor corrections

Conflicts:

	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-04-24 02:20:38 +01:00
Salvatore Orlando d2bd2496cc Work in progress - Need to fix issue on sec storage 2012-04-24 02:20:37 +01:00
Salvatore Orlando 58165221ef Now using vnets instead of network id for creating networks
Fixed issues with vif scripts on 5.6FP1
Fixed ipv6 issue on 5.6FP1
Plus other various fixes and improvements

Starting to remove debug code
NOTE: Network is configured correctly but instances do not start. Possibly indefinite wait occuring on some commands

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/OvsGuestNetworkGuru.java
	server/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
2012-04-24 02:20:37 +01:00
Salvatore Orlando f786505a1b Adding Missing file to source control 2012-04-24 02:20:37 +01:00
Salvatore Orlando 8c398654d3 Open vSwitch tunnel manager
Applying patch with new ovs-tunnel-manager on top of cloudstack oss-master

Conflicts:

	api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
2012-04-24 02:20:37 +01:00
Salvatore Orlando e51ef459d5 Overwriting ovstunnel 2012-04-24 02:20:37 +01:00
Salvatore Orlando 6ca198e6f3 Bug 14370 - addSecondaryStorage always fails: "Can't find pod with specificied podId null"
status 14370: resolved fixed

Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
2012-04-24 02:20:36 +01:00
Jessica Wang 906b40bf97 CS-12407: cloudstack 3.0 UI - Add Netscaler device - when Dedicated checkbox is checked, hide Capacity field and pass "capacity=1" to API. 2012-04-23 16:34:39 -07:00
Alena Prokharchyk 0527cad0b7 CS-14256: throw executionException when finalizeStart fails (no point to retry). 2012-04-23 15:56:10 -07:00
Jessica Wang ff72c83094 CS-14588: cloudstack 3.0 UI - VM Wizard - correct validation message for name field. 2012-04-23 13:37:00 -07:00
Jessica Wang 0e04bfa7dd CS-14588: cloudstack 3.0 UI - VM Wizard - name field - allow uppercase. 2012-04-23 13:34:36 -07:00
Alena Prokharchyk 47a1527719 CS-14591: added XenServer 6.0.2 and VmWare 5.0 as supported hypervisors to fresh 3.0.2 and to the 3.0.1-3.0.2 db upgrade
Conflicts:

	setup/db/db/schema-301to302.sql
2012-04-23 11:19:24 -07:00