Commit Graph

83 Commits

Author SHA1 Message Date
Mice Xia 29459549ba Fix a bug: zoneWizard uses incorrect vlan parameter to create storage network 2012-08-14 13:43:09 +08:00
Alena Prokharchyk b61468d65c Merge branch 'master' into vpc
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2012-08-11 18:27:18 -07:00
Edison Su 263216caa5 Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage).
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
2012-08-10 13:33:06 -07:00
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
Jessica Wang 10cf9c2f20 CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider. 2012-08-01 17:18:28 -07:00
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-31 13:37:28 -07:00
olgasmola 05c9e0bb36 CS-15770: Hide Dedicated option when Basic EIP/ELB is chosen as Network Offering. 2012-07-31 13:35:41 +03: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
David Nalley 9687520712 applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
Jessica Wang a00c21686f (1) CS-15057: Remove jquery.timer.js from source code. Replace it with native JavaScript functions.
(2) CS-14604: cloudstack 3.0 UI - Add Zone Wizard - skip Guest Traffic step if OVS tunnel manager is enabled.
(3) CS-15311: cloudstack 3.0 UI - Add Zone Wizard - add physical network step - no isolation method dropdown if network type is Basic.
(4) CS-14769:  Don't pass subdomainaccess param when scope=project.
(5) CS-15157: cloudstack 3.0 UI - infrastructure page - physical network - network service providers - reset nspMap before populating listNetworkServiceProviders response to nspMap.
2012-06-21 12:13:41 -07:00
Pranav Saxena 52c8feb670 CS-15202: Rename all references in UI of Nexus VSM/dvswitch to Nexus 1000v 2012-06-13 11:24:09 -07:00
Pranav Saxena 28b0df590e CS-15078:Standard name for vSwitch 2012-05-25 00:00:37 +05:30
Brian Federle 6f0fc82fff CS-15067
Provide Nexus vSwitch fields on add cluster form, if on VMware
hypervisor and vSwitch is enabled in configuration
2012-05-23 13:09:50 -07:00
Edison Su bafc3f2a5a CS-14521
Remove CLVM, due to license issue
2012-05-15 15:13:15 -07:00
Brian Federle 63f1385fdd CS-14717
Hide public traffic subnav when in basic zone configuration and not in
EIP/ELB
2012-05-14 15:49:59 -07:00
bfederle 20e8481160 CS-14679
Fix label on primary storage required 'path' field
2012-05-10 14:22:07 -07:00
bfederle 3f6e8d7ef7 Fix BG for setup guest traffic form in basic zone 2012-05-04 09:59:03 -07:00
Jessica Wang 8d92440ec2 CS-14272: cloudstack 3.0 UI - Add Zone Wizard - physical networks step - add Isolation Method dropdown. 2012-04-26 16:19:46 -07:00
Jessica Wang 8e3fc39b67 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:56:29 -07:00
Salvatore Orlando b8889eeb58 Fixing further issue with conflict resolution 2012-04-23 22:35:15 +01:00
Jessica Wang 28218e6cfb cloudstack 3.0 UI - replace old sanitizeXSS() with new cloudStack.sanitize(). 2012-04-23 22:33:18 +01:00
bfederle e23b2ac1fd Zone wizard UI: fix selects
Fix selects being populated twice, due to combination of async calls
and non-async operations when re-selecting options in setup zone step.
2012-04-20 16:05:57 -07:00
bfederle e3bb5435f4 Zone wizard UI
Move network offerings array to local select fn scope, as it is only used there
2012-04-20 16:04:59 -07:00
bfederle 9e2167041b Zone wizard UI
Add missing 'selectedNetworkOfferingObj' var, which may cause JS
errors in some cases
2012-04-20 14:58:08 -07:00
Jessica Wang e852857f9e bug 14516: add zone wizard - exclude EIP, ELB, SG network offerings only when hypervisor is VMware or BareMetal. 2012-04-17 11:06:05 -07:00
Jessica Wang 172ea6f109 cloudstack 3.0 UI - add zone wizard - step 2 - fix a bug that change event of network offerings dropdown was not triggered when visiting step 2 the first time. 2012-04-12 16:25:56 -07:00
Jessica Wang 60d45ec5e3 cloudstack 3.0 UI - fix a JS error "selectedNetworkOfferingObj is not defined" 2012-04-12 16:25:38 -07:00
Jessica Wang b3bf6f08e6 bug 14386: cloudstack 3.0 UI - add zone wizard - basic zone - network offering dropdown - exclude network offerings having EIP/ELB/SG if hypervisor is not XenServer. 2012-04-12 16:25:10 -07:00
Brian Federle db25ef518b bug CS-14441: Fix typo in VMware traffic label ID 2012-04-12 12:17:52 -07:00
Brian Federle ccdca396d3 bug 14603
-Disable display of public traffic icon for basic zone, non-EIP/ELB

-Show public traffic icon as 'required' for basic zone in EIP/ELB
2012-04-04 14:52:38 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Brian Federle 3e2ca5a54f bug 14519
Show separate message for basic zone setup physical network UI
2012-03-28 15:01:43 -07:00
Jessica Wang 1adb426e58 bug 13313: cloudstack 3.0 UI - Add Zone wizard - Skip addHost step when cluster dropdown is selected as VMWare in AddZone step. 2012-03-28 13:31:38 -07:00
bfederle c23f1b8882 UI: Zone wizard update
-Allow for editing of traffic labels within the zone wizard; visible
 by going to the create physical network(s) step and clicking the
 'edit' button under each traffic type.

-Make hypervisor selection part of the create zone step, instead of
 the add cluster step -- this is to allow the physical network UI to
 have the selected hypervisor for the edit traffic labels dialog.

-Show drag-and-drop UI for basic zone setup, so that user can edit
 traffic labels for a basic zone. Note that user can only have one
 physical network here.

-Allow creation of storage traffic in a basic zone configuration, by
 optionally dragging storage traffic type icon to first physical
 network
2012-03-20 13:27:28 -07:00
Jessica Wang 59def829ca cloudstack 3.0 UI - code optimization - seperate code of Enabling Security Group provider code, Adding Netscaler provider, Creating guest network to different functions (to avoid repeating code and to give individual message for each action) 2012-03-20 11:55:09 -07:00
Jessica Wang 794b0516a3 bug 14325: cloudstack 3.0 UI - add zone wizard - basic zone - cover the case that selected network offering has Netscaler provider, but no security group service. 2012-03-19 14:45:22 -07:00
Jessica Wang 04f54ed29e bug 14325: cloudstack 3.0 UI - add zone wizard - basic zone - show netscaler tab if selected network offering's provider is Netscaler. Hide netscaler tab otherwise. 2012-03-19 12:05:08 -07:00
Jessica Wang b867e3fe62 bug 14325: cloudstack 3.0 UI - add zone wizard - basic zone - retrieve provider of selected network offering 2012-03-19 10:48:54 -07:00
Jessica Wang 4b4cba10c7 cloudstack 3.0 UI - replace old sanitizeXSS() with new cloudStack.sanitize(). 2012-03-14 14:03:28 -07:00
Jessica Wang e6d43e157e bug 14073: Quick Installer - make zones created from Quick Installer to be public (not dedicated to any domain) 2012-02-29 15:22:36 -08:00
Jessica Wang 74be336283 zone wizard - declare item before using it. 2012-02-22 14:49:27 -08:00
Brian Federle a48e0baeaa Fix for primary storage step prefilter in IE 2012-02-22 14:36:32 -08:00
Jessica Wang db255b31dd bug 13665: Quick Install wizard - pick the network offering that has SecurityGroups service (but no LB, StaticNat). Enable SecurityGroups provider before creating a guest work. [reviewed-by: Brian] 2012-02-21 19:23:22 -08:00
Jessica Wang 9880d39b55 add zone wizard - fix a JS error "server is undefined" 2012-02-19 10:40:28 -08:00
Jessica Wang 2b6e8ef895 add zone wizard - add primary storage step - storage tags field is optional. 2012-02-19 10:39:54 -08:00
Jessica Wang eed5367238 bug 13680: add zone wizard - when configuration "use.local.storage" is true, skip add primary storage skip. 2012-02-19 10:20:14 -08:00
Jessica Wang 89cccdf744 add zone wizard - advanced zone - storage traffic - add IP Range - add gateway field. 2012-02-17 15:14:05 -08:00
Jessica Wang 8c75bf8805 add zone wizard - preFilters - addPublicNetwork - consolidate conditinal statement 2012-02-17 12:49:16 -08:00
Brian Federle 46c7ab78ea Zone wizard: fix public traffic description 2012-02-17 11:52:47 -08:00
Jessica Wang 6bbe637e84 bug 13628: add zone wizard - show different description of public traffic, guest traffic for basic zone and advanced zone. 2012-02-17 11:42:34 -08:00