etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,110 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

4071 Commits

Author SHA1 Message Date
Pranav Saxena e8629c00fa not displaying acl id on the tier detail view 2013-06-05 16:19:05 +05:30
Jessica Wang 402cc917b9 CLOUDSTACK-2782: UI - zone wizard - add cluster step - remove obsolete code. 2013-06-04 16:20:34 -07:00
Jessica Wang 86c0e28c04 CLOUDSTACK-2029: UI - zone wizard - primary storage step - pass args.data.cluster.hypervisor to API when scope is zone-wide. 2013-06-04 16:11:23 -07:00
Brian Federle dfdb8a967e CLOUDSTACK-1742: Better text labels for secondary IP UI 2013-06-04 16:06:48 -07:00
Jessica Wang 782bf82744 CLOUDSTACK-2029: UI - zone wizard - primary storage step - scope dropdown - show zone-wide option when hypervisor is VMware or KVM. 2013-06-04 15:42:34 -07:00
Brian Federle e883526449 CLOUDSTACK-1763: Better confirm message for acquire NIC IP 2013-06-04 15:25:50 -07:00
Brian Federle 317c8e0606 CLOUDSTACK-2185: Display VM IP on PF multi-edit 2013-06-04 15:03:28 -07:00
Jessica Wang 7e8d19963d CLOUDSTACK-2842: UI - fix a JS error "elems is undefined" when popping up a dialog box that has zone dropdown and there is no zone created yet. 2013-06-04 14:22:47 -07:00
Brian Federle 55148d90a8 CLOUDSTACK-2185: Display VM IP on static NAT detail page 2013-06-04 14:16:00 -07:00
Brian Federle c190b05057 CLOUDSTACK-2185: Allow custom 'ipaddr' argument when creating NIC IP 2013-06-04 14:04:43 -07:00
Jessica Wang 9f564fc77f CLOUDSTACK-747: internal LB in VPC - internalLB detailView - implement Delete Internal LB action. 2013-06-04 13:58:34 -07:00
Brian Federle d8f81fe14d CLOUDSTACK-2205: Hide egress tab for shared networks 2013-06-04 13:46:19 -07:00
Brian Federle eaea724044 VPC UI: Fix dashboard totals for admin viewing user VPCs 2013-06-04 13:37:27 -07:00
Brian Federle a3b3753da3 VPC UI, chart: Color connector lines for tiers w/ public network 2013-06-04 09:00:54 -07:00
Pranav Saxena 00715c9b86 Displaying ACL name as None if acl is not associated with a tier 2013-06-04 20:22:02 +05:30
Pranav Saxena ee3043b884 Changing drop box to textfield 2013-06-04 17:50:15 +05:30
Pranav Saxena 2a3cfe4b22 CLOUDSTACK-2782:UI Support to add VMware DC to CloudStack zone through the zone wizard 2013-06-04 16:58:32 +05:30
Pranav Saxena cc2091078d Legacy zone validation changes 2013-06-04 10:30:25 +05:30
Jessica Wang 84634d4cf6 CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - rename action name to be more clear. 2013-06-03 16:45:49 -07:00
Jessica Wang 5a525211de CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - implement Remove VMWare DC action. 2013-06-03 16:37:38 -07:00
Jessica Wang bfe05acd95 CLOUDSTACK-2782: UI - Infrastructure menu - zone detail page - add new action Add VMWare DC. 2013-06-03 16:28:09 -07:00
Jessica Wang b325f7d3bd CLOUDSTACK-2744: UI - create network offering dialog - when VPC checkbox is unchecked and LB service is checked, provider option InternalLbVm should be disabled. 2013-06-03 12:32:08 -07:00
Brian Federle acc71fb735 CLOUDSTACK-766: Support assigning VLAN ID to network 
On add network form, if selected network offering has
specifyVlan=true, show VLAN text field.
 2013-06-03 11:45:28 -07:00
Jessica Wang 24d6055177 CLOUDSTACK-2744: UI - create network offering dialog - when LB Type is selected as PublicLb, hide internalLbVm from provider list. 2013-06-03 11:25:42 -07:00
Pranav Saxena 2aae10bb64 CLOUDSTACK-2029:Zone wide primary storage for VMware 2013-06-03 17:04:39 +05:30
Pranav Saxena 45681c57f6 CLOUDSTACK-2029:Zone wide primary storage for VMware 2013-06-03 17:03:07 +05:30
Pranav Saxena 35f2dc6e52 changing vpc_id to vpcid 2013-06-03 15:42:55 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling" 
This reverts commit 6dad8adf8f.
 2013-06-03 07:48:03 +02:00
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Jessica Wang 8deeb90a6d CLOUDSTACK-2746: UI - InternalLB - VPC section - tiers - add tier dialog - network offering dropdown - exclude PublicLb network offerings only when PublicLb networks exists (i.e. LB network whose provider is VpcVirtualRouter or Netscaler exists). 2013-05-31 15:35:24 -07:00
Brian Federle 66f5d4a537 Fix dialog overlay 'buildup' when changing some selects 2013-05-31 14:58:12 -07:00
Pranav Saxena 8c9cd6e0ca nTIER - detail view to show the acl name with which it is associated 2013-05-31 11:55:17 +05:30
Pranav Saxena 2f29185943 Merge branch 'UI-explicitDedication' 2013-05-31 10:04:05 +05:30
Jessica Wang 7934b16317 CLOUDSTACK-2745: UI - Internal LB Rules - (1) detailView: remove Rules tab and add source port, instance port in Details tab. (2) Create Internal LB Rule dialog: corret label of source port and instance port. 2013-05-30 17:06:22 -07:00
Jessica Wang 8ece25c1f2 CLOUDSTACK-681: deployment planner - create compute offering dialog - deployment planner dropdown - add blank option and make it as default option. Not pass anything to API call when blank option is selected. 2013-05-30 16:27:36 -07:00
Pranav Saxena c42da47aa6 formatting the code for better readability 2013-05-30 21:57:17 +05:30
Pranav Saxena e94c8176d2 Explicit Dedication : Zone 2013-05-30 21:57:17 +05:30
Pranav Saxena 5fe0d028a2 Explicit Dedication through zone wizard 2013-05-30 21:57:16 +05:30
Pranav Saxena 8c79aa8cc1 Explicit Dedication - Zone action item dedication/release API integration 2013-05-30 21:57:15 +05:30
Pranav Saxena 1545b3f3ed host and cluster action item API integration calls 2013-05-30 21:57:15 +05:30
Pranav Saxena e03e2aab06 explicit Dedication - Cluster API integration action item for dedication/release 2013-05-30 21:57:15 +05:30
Pranav Saxena 2489d858f9 explicit Dedication - Pod action filter for release/dedicate action items 2013-05-30 21:57:14 +05:30
Pranav Saxena cee82eca55 explicit Dedication - Pod action filter for releasing dedicated pod (API Call) 2013-05-30 21:57:14 +05:30
Pranav Saxena 1c9a34abcc explicit Dedication - Pod action filter for release/dedicate action items 2013-05-30 21:57:14 +05:30
Pranav Saxena fd72c12967 explicit dedication - dedicatePod API call action item integration 2013-05-30 21:57:13 +05:30
Pranav Saxena 55d3176332 explicit dedication - POD UI-API detail view integration 2013-05-30 21:57:13 +05:30
Pranav Saxena e95ddb6562 Explicit Dedication - Cluster detail View UI-API Integration code 2013-05-30 21:57:13 +05:30
Pranav Saxena 6aa2268efb Explicit Dedication - Host UI-API Integration code 2013-05-30 21:57:12 +05:30
Pranav Saxena 9f76c0559c Explicit Dedication - Cluster UI-API Integration code 2013-05-30 21:57:12 +05:30
Pranav Saxena a52b3139c5 Pod explicit dedication Detail View 2013-05-30 21:57:12 +05:30
Pranav Saxena 1553ec6580 explicit dedication API-UI integration 2013-05-30 21:57:11 +05:30
Pranav Saxena 5c18ba648b Zone Dedication UI-API Integration Code 2013-05-30 21:57:10 +05:30
Pranav Saxena c5493f0778 Explicit Dedication - Cluster UI/API Integration code 2013-05-30 21:57:10 +05:30
Pranav Saxena 60ff005939 Explicit Dedication - Host UI/API Integration code 2013-05-30 21:57:10 +05:30
Pranav Saxena 97cb514f05 Pod dedication action button functionality 2013-05-30 21:57:10 +05:30
Pranav Saxena aab0bb4d31 Dedicate POD -UI and API integration code 2013-05-30 21:57:09 +05:30
Pranav Saxena 25643459af Dedicate POD -UI and API integration code 2013-05-30 21:57:09 +05:30
Pranav Saxena 4d5033f263 Cluster/Pod/Host Explicit Dedication front end UI 2013-05-30 21:57:09 +05:30
Pranav Saxena 35fe8e86c0 removing the tooltip helper for implicit dedication 2013-05-30 15:30:32 +05:30
Pranav Saxena 6cbd85f095 Implicit Dedication UI changes 2013-05-30 15:27:18 +05:30
Jessica Wang ab2e3b9e07 CLOUDSTACK-2678: portable IP ranges - regions menu - region detailView - show "View Portable IP Ranges" for root-admin, hide it for regular-user/domain-admin. 2013-05-28 16:16:34 -07:00
Jessica Wang 560fa52fdc CLOUDSTACK-2678: portable IP ranges - Associate IP Address - pop up a dialog that have cross zone dropdown (yes/no) and send selected option to API call. 2013-05-28 15:59:37 -07:00
Jessica Wang ecc30ddc0d CLOUDSTACK-2678: portable IP ranges - regions menu - Portable IP Ranges - implement Delete Portable IP Range action. 2013-05-28 15:18:36 -07:00
Jessica Wang 78e50c3bc8 CLOUDSTACK-2678: portable IP ranges - regions detailView - Portable IP Ranges - implement Add Portable IP Range action. 2013-05-28 14:17:47 -07:00
Jessica Wang 7ee71dfd87 CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Dedicated Guest VLAN Range tab - Dedicate VLAN Range dialog - change VLAN Range field from textbox to dropdown that lists all existing Guest VLAN Ranges under the physical network. 2013-05-28 11:51:46 -07:00
Anthony Xu 19a1116df2 Merge branch '4-2-advanced-zone-security-group' 2013-05-28 11:03:56 -07:00
Pranav Saxena b03e419bf9 Merge branch 'ui-vpc-redesign' 2013-05-28 13:21:22 +05:30
Jessica Wang d99fae07c7 CLOUDSTACK-747: Infrastructure menu - service providers - change display name of internalLbVm to be Internal LB VM. 2013-05-24 16:36:45 -07:00
Jessica Wang 7cc1e82210 CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Release Dedicated VLAN Range action - change label and message. 2013-05-24 16:17:39 -07:00
Jessica Wang 11a7e46dfb CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - Dedicated Guest VLAN Range tab - implement Release Dedicated VLAN Range action. 2013-05-24 15:45:10 -07:00
Jessica Wang b247ba6b4f CLOUDSTACK-1974: Dedicate Guest VLAN Range - UI - Infrastructure menu - physical network - Guest - devailView - (1) add new tab "Dedicated VLAN Ranges" that list dedicated Guest VLAN Ranges under the physical network. (2) implement "Dedicate Guest VLAN Range" action. 2013-05-24 15:24:00 -07:00
Brian Federle cd7287a4e1 Site-to-site VPN UI: Show confirm dialog if no gateways exist 2013-05-24 13:06:51 -07:00
Brian Federle f3cc57f82e Merge branch 'master' into ui-vpc-redesign 2013-05-24 11:09:27 -07:00
Jessica Wang 3d16e82547 CLOUDSTACK-2678: portable IP ranges - regions detailView - add viewAll path to Portable IP Ranges listView. 2013-05-24 10:33:28 -07:00
Jessica Wang 6975f6bac6 CLOUDSTACK-2377: UI - network menu - add guest network dialog only allows to add Isolated network, but not shared network. Change label to make it clear. 2013-05-24 10:09:44 -07:00
Pranav Saxena 8b9d6d81a2 Implicit dedication mode 2013-05-24 17:28:11 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Jessica Wang 57049d5aef CLOUDSTACK-2538: object_store - UI - Infrastrcuture menu - secondary storages page - add secondary storage step - add name field. 2013-05-23 17:08:37 -07:00
Jessica Wang c163846044 CLOUDSTACK-2538: object_store - UI - zone wizard - add secondary storage step - add name field. 2013-05-23 16:49:16 -07:00
Brian Federle f92db64c78 Install wizard UI: Add preinstall hook 
For fresh install, adds hook to install wizard UI to show a custom
'step' before the initial welcome screen.

Pre-install specified by providing 'cloudStack.preInstall,' which
returns a jQuery object to be displayed. It passes args.complete,
which when called will proceed to the first step of the install
wizard.
 2013-05-23 15:59:03 -07:00
Jessica Wang 026c2cec6d CLOUDSTACK-2504: UI - create network offering dialog - pass specifyIpRanges=false for Isolated Network. 2013-05-23 14:35:40 -07:00
Brian Federle f52a833f4e Merge branch 'master' into ui-vpc-redesign 2013-05-23 14:27:33 -07:00
Jessica Wang a292bfbfcd CLOUDSTACK-747: UI - VPC tier - Public LB IP - populate listView of Public LB IP. 2013-05-23 11:53:25 -07:00
Jessica Wang bc7d7e64c0 CLOUDSTACK-747: UI - VPC tier - implement count of Public LB IP. 2013-05-23 11:39:27 -07:00
Jessica Wang d515602873 CLOUDSTACK UI - VPC - site-to-site VPN - VPN connection - fix a JS error "elems is undefined" when clicking Create VPN Connection. 2013-05-23 10:39:32 -07:00
Pranav Saxena 4fdd0261fe port forwarding issues with the listNics API response parameter 2013-05-23 14:56:32 +05:30
Brian Federle 9071456596 Split 'internal LB' / 'public LB' into separate list views, intead of subsections 2013-05-22 16:32:20 -07:00
Brian Federle 0eb73e9dec Update VPC tier dashboard 
- Remove 'Port forwarders' -- Getting IPs by PF is not supported by API

- Split Public + Internal LB into separate items

- Use API response 'count' for count number, instead of array
  '.length' to fix issues with larger results
 2013-05-22 16:28:09 -07:00
Brian Federle ea440f2593 Add API calls to update ACL item order on drag-and-drop 2013-05-22 15:50:19 -07:00
Jessica Wang ff58052d2c CLOUDSTACK-747: internal LB in VPC - internal LB detailView - add rules tab, assignedVMs tab. 2013-05-22 13:18:53 -07:00
Brian Federle 9e0733c83e Add dashboard count for IPs with port forwarding 2013-05-22 12:28:02 -07:00
Brian Federle 763f6fd47b Add dashboard counts for static NAT IPs 2013-05-22 12:15:45 -07:00
Brian Federle f2dd65c397 Add dashboard counts for private gateways, ip addresses and vpns 2013-05-22 12:01:22 -07:00
Brian Federle 7ac0141f7e Merge branch 'master' into ui-vpc-redesign 2013-05-22 11:45:50 -07:00
Jessica Wang a0e75c12cd CLOUDSTACK-747: internal LB in VPC - fix a bug that Source IP Address column was not filled after Add Internal LB action was complete. 2013-05-22 11:21:20 -07:00
Brian Federle b11c44f91d Internal LB: Pre-select existing VMs on LB rule 2013-05-22 11:11:33 -07:00
Jessica Wang c7b902024c CLOUDSTACK-747: internalLb in VPC - Infrastructure menu - network service provider - add InternalLbVm. Clicking it will lead to a screen that can enable/disable provider and have instances tab that can start/stop LB Instance. 2013-05-22 10:49:26 -07:00
Jessica Wang 29574267c9 CLOUDSTACK-747: UI - create network offering - default sourceNat type as per account instead of per zone. 2013-05-22 10:48:44 -07:00
Jessica Wang 1f420ec085 CLOUDSTACK-747: internalLb in VPC - Infrastructure menu - network service provider - add InternalLbVm. Clicking it will lead to a screen that can enable/disable provider and have instances tab that can start/stop LB Instance. 2013-05-22 10:42:49 -07:00
Murali Reddy 53499c0858 changing default 'GSLB provider' check box value to unchecked in UI 2013-05-22 16:26:46 +05:30
Pranav Saxena 5d3e6bd397 Implicit Dedication - Key and Value for iMplicit Dedication planner 2013-05-22 14:35:16 +05:30
Pranav Saxena 49e39e51f2 CLOUDSTACK-681:Implicit Dedication UI support 2013-05-22 12:31:48 +05:30
Pranav Saxena ba08af9361 ACL List - Addition in the detail view for Tier 2013-05-22 10:50:15 +05:30
Brian Federle 531a2f713f Add ACL lists count to VPC chart 2013-05-21 16:28:57 -07:00
Brian Federle a3e97bbc3f Remove console.log 2013-05-21 16:17:12 -07:00
Brian Federle 4ce76429e2 Add internal LB count to VPC chart 2013-05-21 16:16:27 -07:00
Jessica Wang 3c2be57c35 CLOUDSTACK-747: internalLb in VPC - internal LB detail View - implement action assign VM to internal lb. 2013-05-21 15:58:39 -07:00
Brian Federle 7c05bb13cc Fix quickview for ACL list 2013-05-21 15:51:15 -07:00
Brian Federle 62f7ab6ffe Delete ACL action: Rename to 'remove' to fix UI feedback 2013-05-21 15:48:11 -07:00
Brian Federle 24dd6fb66f Cleanup formatting 2013-05-21 15:40:00 -07:00
Brian Federle b88da4e1c1 VPC UI: Reload chart on perform detailView action 2013-05-21 15:36:50 -07:00
Brian Federle c6c85387fb VPC: Use listView selector for assignVm action 2013-05-21 15:09:30 -07:00
Brian Federle dfa93b52a8 Detail view actions: Add support listView selection 
Adds a new dialog 'cloudStack.dialog.listView'

-- Supports displaying a list view in a popup dialog, for selecting
   items for an action (i.e., selecting VMs for an LB rule). Arguments
   are a list view object and the 'type' of selection: either
   'checkbox' or 'radio'

Example:

detailView: {
  name: 'Internal Lb details',
  actions: {
    assignVm: {
      label: 'Assign VMs to LB',
      messages: {
        notification: function(args) { return 'Assign VM to internal LB rule'; }
      },
      listView: $.extend(true, {}, cloudStack.sections.instances.listView, {
        type: 'checkbox',
        filters: false
      }),
      action: function(args) {
        args.response.success();
      },
      notification: {
        poll: function(args) {
          args.complete();
        }
      }
    }
  },
  ...
}
 2013-05-21 15:07:21 -07:00
Jessica Wang 41f9a12d38 CLOUDSTACK-747: internalLb in VPC - populate detailView of internal LB. 2013-05-21 13:48:27 -07:00
Jessica Wang c89ca6a92f CLOUDSTACK-747: internalLb in VPC - populate listView of internal LB. 2013-05-21 13:15:09 -07:00
Brian Federle 9fff2c4a66 Add VM total to dashboard 2013-05-21 12:54:07 -07:00
Brian Federle 451c83c998 Fix listView add/replace row for VPC section 2013-05-21 12:52:55 -07:00
Jessica Wang 0eceb0da60 CLOUDSTACK-747: UI - create network offering - default sourceNat type as per account instead of per zone. 2013-05-21 11:59:03 -07:00
Jessica Wang a75cf9a79d CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when Lb service is checked and LB provider is InternalLbVm, pass capability type as lbSchemes and capability value as internal. 2013-05-21 11:44:50 -07:00
Jessica Wang 263cc9a62c CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when VPC checkbox is checked, enable provider InternalLbVm, VpcVirtualRouter, Netscaler. When VPC checkbox is unchecked, disable provider InternalLbVm, VpcVirtualRouter. 2013-05-21 11:44:20 -07:00
Jessica Wang e42ddb83c2 CLOUDSTACK-747: internalLb in VPC - UI - create network offering - add LB Type dropdodwn which is shown when VPC is checked and LB service is checked, hidden otherwise. LB Type (publicLb, internalLb) will determine the options in LB Provider dropdown. 2013-05-21 11:43:54 -07:00
Jessica Wang 75df90663f CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when Lb service is checked and LB provider is InternalLbVm, pass capability type as lbSchemes and capability value as internal. 2013-05-21 11:37:12 -07:00
Jessica Wang ccf1ebc26b CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when VPC checkbox is checked, enable provider InternalLbVm, VpcVirtualRouter, Netscaler. When VPC checkbox is unchecked, disable provider InternalLbVm, VpcVirtualRouter. 2013-05-21 11:08:40 -07:00
Pranav Saxena e6382b1896 Delete ACL list filter and css 2013-05-21 22:15:15 +05:30
Pranav Saxena e5e41b0f45 Remove ACL List action item 2013-05-21 16:35:14 +05:30
Jessica Wang 933060dfeb CLOUDSTACK-747: internalLb in VPC - UI - create network offering - add LB Type dropdodwn which is shown when VPC is checked and LB service is checked, hidden otherwise. LB Type (publicLb, internalLb) will determine the options in LB Provider dropdown. 2013-05-20 19:18:56 -07:00
Brian Federle 6b7098c990 Add network ACL item: Fix add action 2013-05-20 14:10:52 -07:00
Brian Federle bd764cc581 Pass dashboard data via dataProvider 2013-05-20 13:55:50 -07:00
Jessica Wang cf6045f1aa CLOUDSTACK-747: internalLb in VPC - UI - create network offering - system offering dropdown is for router only. Change its variable name to be more intuitive. 2013-05-20 13:41:02 -07:00
Jessica Wang 9e24af77b9 CLOUDSTACK-747: internalLb in VPC - UI - create network offering - system offering dropdown is for router only. Change its variable name to be more intuitive. 2013-05-20 13:37:52 -07:00
Brian Federle 034c21b6fc ACL multi-edit: add 'action' field to specify rule as allow/deny 2013-05-20 13:32:46 -07:00
Pranav Saxena a1614a5f8f ACL DENY RULES Network ACL List Detail View 2013-05-21 01:25:10 +05:30
Pranav Saxena 981b5ddd1b ACL DENY RULES UI-API Integration 2013-05-20 23:42:55 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Jessica Wang cd318661d2 CLOUDSTACK-2505: object_store - UI - infrastructure menu - secondary storages - add URL, Provider, Scope, Details to detailView. 2013-05-16 13:54:32 -07:00
Jessica Wang 44adba06f4 CLOUDSTACK-2505: object_store - UI - zone wizard - add secondary storage- S3, Swift - not pass details[i] info when corresponding field is empty. 2013-05-16 13:53:57 -07:00
Brian Federle 7aaff0cfed Fix typo 2013-05-16 13:46:37 -07:00
Brian Federle ff287c10d9 Tier LB UI: Split list view into internal/public 2013-05-16 13:46:14 -07:00
Jessica Wang 47aeda9893 CLOUDSTACK-2505: object_store - UI - infrastructure menu - add secondary storage- Swift - not pass details[i] info when corresponding field is empty. 2013-05-16 13:13:29 -07:00
Jessica Wang d5ab59614a CLOUDSTACK-2505: object_store - UI - infrastructure menu - add secondary storage- S3 - not pass details[i] info when corresponding field is empty. 2013-05-16 13:05:36 -07:00
Jessica Wang b5acb9034f CLOUDSTACK-747: UI - Internal LB - implement Add Internal LB action. 2013-05-16 11:37:16 -07:00
Brian Federle 8d9a8ca15e Merge branch 'master' into ui-vpc-redesign 2013-05-16 10:12:11 -07:00
Jessica Wang 3bf10505b8 CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC. 2013-05-15 19:41:50 -07:00
Pranav Saxena cf1fada372 CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails 2013-05-15 19:41:49 -07:00
Sheng Yang 2d2c0c48cd Merge branch 'pvlan' 
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
 2013-05-15 16:08:08 -07:00
Brian Federle 34d7014c88 ACL multi-edit: Fix reorder drag handle 2013-05-15 15:58:55 -07:00
Brian Federle 612ce62cae Add tier VM, PF, static NAT links 2013-05-15 15:33:13 -07:00
Brian Federle 81bce385bf Fix typo 2013-05-15 15:01:40 -07:00
anthony 297115cac5 CLOUDSTACK-737 
add xenserver support in UI
     only XenServer and KVM clusters are allowed in security enabled zone.
     only shared security enabled networks are allowed in security enabled zone.
 2013-05-15 14:53:48 -07:00