Commit Graph

4071 Commits

Author SHA1 Message Date
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
Brian Federle a4fc86ece9 Tier LB rules: Add load balancing multi-edit 2013-05-15 14:28:54 -07:00
Jessica Wang f985e11c28 CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC. 2013-05-15 14:23:49 -07:00
Brian Federle 42ed9e13f3 Add placeholder tier LB list view + add action 2013-05-15 12:28:03 -07:00
Brian Federle 7ed11ee911 Add site-to-site VPN to VPC chart 2013-05-15 12:09:50 -07:00
Brian Federle 08bc6bf778 Fix 'protocolnumber' change event 2013-05-15 11:57:14 -07:00
Jessica Wang 7e0006a3e5 CLOUDSTACK-747: internalLb in VPC - UI - create tier dialog - only one tier is allowed to have PublicLb in a VPC. 2013-05-15 11:03:51 -07:00
Brian Federle 59a99848b1 Merge branch 'master' into ui-vpc-redesign
Conflicts:
	ui/scripts/vpc.js
2013-05-15 10:18:55 -07:00
Pranav Saxena 6d6887533f CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails 2013-05-15 18:01:10 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Brian Federle cb31791adf WIP ACL draggable multi-edit 2013-05-14 16:25:37 -07:00
Brian Federle 1c2ee35345 Merge branch 'master' into ui-vpc-redesign 2013-05-14 13:55:09 -07:00
Pranav Saxena edb2f3da26 CLOUDSTACK-768:ACLs on Private GATEWAY :Acl id on Private Gateway ListView 2013-05-15 00:22:26 +05:30
Pranav Saxena 10380cea41 CLOUDSTACK-768:ACLs on Private GATEWAY 2013-05-14 22:47:53 +05:30
Jessica Wang b082e23af3 CLOUDSTACK-2351: object store - UI - restore UI change that was overwriten by the sync from master branch. 2013-05-13 16:22:20 -07:00
Jessica Wang eeb012308c CLOUDSTACK-2351: object store - UI - zone wizard - add secondary storage step - when provider is S3, add Create NFS Cache Storage option. 2013-05-13 15:10:34 -07:00
Brian Federle 3c24380f9d Fix typo 2013-05-13 14:54:35 -07:00
Brian Federle c819980338 Add place holder for internal LB 2013-05-13 14:06:43 -07:00
Brian Federle 9ac67b8546 Merge branch 'master' into ui-vpc-redesign
Conflicts:
	ui/modules/modules.js
2013-05-13 11:12:32 -07:00
Brian Federle 35164fde65 Merge branch 'ui-cisco-asa1000v-support' 2013-05-13 11:10:34 -07:00
Brian Federle 9be36609fd Merge branch 'master' into ui-vpc-redesign 2013-05-13 11:00:16 -07:00
Pranav Saxena 2a4184bbcc CLOUDSTACK-2394:Ability to delete Events and Alerts:UI: Make Category field visible on UI 2013-05-13 12:11:26 +05:30
Pranav Saxena 225a46746a Correcting the text for alert types 2013-05-13 01:53:33 +05:30
Pranav Saxena 0ed0e9a26e CLOUDSTACK-1828:NAT on private gateway UI support 2013-05-12 23:59:39 +05:30
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Brian Federle df0919bef5 Add placeholder network ACL list view 2013-05-10 16:03:44 -07:00
Brian Federle 6ac4f79397 VPC chart: add link to public IP addresses list 2013-05-10 15:48:32 -07:00
Brian Federle 2eb29a5d81 Tier details: disable view all link, ACL tab 2013-05-10 15:42:18 -07:00
Brian Federle 55ac9c1b0f Add private gateway section to new chart 2013-05-10 15:25:46 -07:00
Pranav Saxena 7ca488334f CLOUDSTACK-1828:NAT on private gateway UI support 2013-05-11 02:50:16 +05:30
Brian Federle f7fab6f801 Merge branch 'ui-cisco-asa1000v-support' 2013-05-10 10:02:46 -07:00
Pranav Saxena edd2fbb266 CLOUDSTACK-760:Allow ACL on all layer 4 protocols 2013-05-10 16:47:09 +05:30
Pranav Saxena e40aba3bc0 CLOUDSTACK-2411:UI:fail to enable conserve mode while creating NO with guest type as shared 2013-05-10 11:05:47 +05:30
Jessica Wang 1e539e81e3 CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storage
- Add Secondary Storage - when provider is S3, show option to create NFS cache storage.
2013-05-09 17:48:00 -07:00
Jessica Wang b1f6d89141 CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - populate provider detailView. 2013-05-09 15:31:25 -07:00
Jessica Wang 04be0cdec2 CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - show Cisco VNMC in Advanced zone, hide it in Basic zone. 2013-05-09 14:33:18 -07:00
Alena Prokharchyk 2660a6b7a7 CLOUDSTACK-747: Internal LB between VPC tiers support
Squashed commit of the following:

commit def0861d5a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 10:53:09 2013 -0700

    Inernallb: added internalLbVm to the list of network elements for nonoss build

commit 56d94fc074
Merge: d828c15 8f9a42e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 09:51:36 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java

commit d828c154fd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 14:58:22 2013 -0700

    internallb: Fixed nonoss build

commit 1b8a6986a6
Merge: 9e74fa9 738d35a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 13:20:07 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/com/cloud/network/NetworkModel.java
    	api/src/com/cloud/network/rules/LoadBalancerContainer.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
    	client/tomcatconf/commands.properties.in
    	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkModelImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkModelImpl.java
    	server/test/resources/appLoadBalancer.xml
    	setup/db/db/schema-410to420.sql
    	test/integration/component/test_multiple_ip_ranges.py
    	test/integration/smoke/test_guest_vlan_range.py
    	tools/marvin/marvin/integration/lib/base.py

commit 9e74fa9406
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Thu May 9 00:11:40 2013 +0530

    marvin changes for internallbvm provider

    - changed the simulator context to load the internallb bean
    - fixed deployDataCenter to use the additional provider by default
    - fixed the sandbox script and the setup script for simulator checkin
      tests

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 0a2d49301b
Author: Jessica Wang <jessicawang@apache.org>
Date:   Tue May 7 15:50:41 2013 -0700

    Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider.

commit 43e1667f90
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 13:26:53 2013 -0700

    Moved all DAOs and VOs to the cloud-engine-schema project

commit 2fd94c8bbe
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 18:26:08 2013 +0530

    CLOUDSTACK-893 api

commit 12b64d6c00
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 17:06:15 2013 +0530

    Fixing the gmaven configuration for marvin/pom.xml

    For the marvin checkin test custom properties had a typo when run for
    the *nix environment.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1e4274dd9f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:43 2013 +0530

    Renaming TesDedicateVlanRange -> TestDedicateVlanRange

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 9264ac526f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:20 2013 +0530

    Adding isolation method to the zone creation of marvin

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 3a0dc67de0
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:27:26 2013 +0530

    adding ACL for dedicateGuestVlanRange set of APIs

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 79f6e11368
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:26:48 2013 +0530

    add debug logs when access checkers fail to find API

    When the access checkers fail for api discovery, we fail silently.
    instead record a debug message.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 92cb7d3e0f
Author: Hugo Trippaers <trippie@gmail.com>
Date:   Tue May 7 11:44:23 2013 +0200

    commit e0d8f01ecd enabled all tests. Fix
    AWSAPI build by removing broken tests and excluding failing tests.

commit 4a391464c7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 10:57:23 2013 +0200

    commit e0d8f01ecd enabled all tests, but the tests in vmware-base are horribly broken and will not compile with the current CloudStack.

    Removing the tests to fix the nonoss build and they are so broken they should be rewritten from scratch anyway.

commit 2ca03a8513
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:51:34 2013 +0530

    moving test data to top level dictionary

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit ceaa4e1b0d
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:56 2013 +0530

    Adding tracelogs to the API discovery service

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit a3f5f01c7e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:12 2013 +0530

    dedicateGuestVlanRange is admin only API

    Adding ACL for the dedicateGuestVlanRange API.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1c4c80fe91
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 09:58:16 2013 +0200

    Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm

commit 8103f3c386
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 11:30:17 2013 +0530

    CLOUDSTACK-893 first cut

commit 67d0411d73
Author: Dave Cahill <dcahill@midokura.com>
Date:   Fri Apr 19 17:31:44 2013 +0900

    Add docs for MidoNet networking plugin [CLOUDSTACK-996]

    Signed-off-by: Dave Cahill <dcahill@midokura.com>

commit c745e6d28e
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 16:34:03 2013 -0700

    Fixed up the simulator to run with windows paths in cygwin

commit be91c03702
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 10:34:22 2013 -0700

    Moved over the VLAN daos

commit dcc09f8472
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:31:47 2013 -0700

    Missing file and updated .gitignore

commit e9953cd1a8
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:29:59 2013 -0700

    Fixed up unit testing to use only an in class TestConfiguration

commit 6727571403
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 15:20:49 2013 -0700

    Fixed an incorrect unit test for affinity group.  Removed some useless pom.xml.

commit d015fb3520
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 06:50:38 2013 -0700

    Moved most of the VOs and DAOs from server package into engine-schema as well

commit 77547a58df
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 15:15:57 2013 -0700

    Removed files that are no longer used and further separated out the files in the core project

commit 345f3d3482
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 05:46:15 2013 -0700

    Moved agent commands to core and out of api

commit e91ca00571
Author: Alex Huang <alex.huang@gmail.com>
Date:   Tue Apr 30 19:06:20 2013 -0700

    Removed framework-api which is completely useless.  Changed framework-ipc to reference gson itself.  Move VOs into engine-schema.

commit f64564e490
Author: Dennis Lawler <dlawler@gmail.com>
Date:   Mon Apr 29 15:10:09 2013 -0700

    Removing filterwin2k option

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 944a7ea5d6
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:57:02 2013 +0100

    CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit ff7f8ba362
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:56:06 2013 +0100

    CLOUDSTACK-2322: update network.gateway to fix deployVm error on
    SharedNetwork after ipv6 support

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit a153373c7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon May 6 11:45:19 2013 -0700

    CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack

commit 46f59cd49e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 20:39:36 2013 +0530

    Fixed the incorrect assertion in noncontiguous_vlan test

    The assertion fails if the VLAN is found in which case find returns a
    positive number. So here the assertion should infact assert < 0 result.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit bd1dcc10b3
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:53:42 2013 +0530

    Affinity Groups requires multiple storage pools

    Fixing the affinity group test which would fail to find the appropriate
    storage pool to satisfy the anti-affinity group of the second VM

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 7f853cdb8f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:16:15 2013 +0530

    fixing double calls to VM deploy

    This fixes regression introduced in commit 2f40a90c that made duplicate
    calls to deployVirtualMachine.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 646e810fcf
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 18:51:53 2013 +0530

    fixing wildcard imports

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit b29b6e8525
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Fri May 3 14:03:53 2013 +0200

    BigSwitch should only respond if it is the actual provider on the network.

    This fixes an NPE during the release call.

commit 6fcc9b009b
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Thu May 2 17:38:27 2013 +0200

    Prevent Nicira NVP tags from exceeding the 40 character limit.

commit d8e61a1c0a
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   Thu May 2 13:45:39 2013 +0530

    CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates

    Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

commit 5b6e1140f9
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:58 2013 -0400

    CLOUDSTACK-2339: Adding libcloud example

commit 7be62d2374
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:19 2013 -0400

    CLOUDSTACK-2338: Adding example of how to sign api requests in python

commit 156fd68902
Author: Talluri <Srikanteswararao.Talluri@citrix.com>
Date:   Fri May 3 23:11:56 2013 +0530

    CLOUDSTACK-2323: fix test scripts to conform with library changes

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33ff5e9107
Author: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Date:   Tue Apr 30 20:09:46 2013 +0530

    CLOUDSTACK-702: Tests for Multiple IP Ranges

    1.Deleting IP Range from the existing CIDR
    2.Add non-contiguous guest IP range in new CIDR
    3.Add overlapped guest IP range in existing CIDR

    Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33059d1f66
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 14:08:40 2013 +0530

    scaleUp VM response change corresponding UI changes

commit 92e18d8106
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 13:45:32 2013 +0530

    CLOUDSTACK-2337:Resize button available for root/domain admin and normal users

commit d5cd3f7e00
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed May 1 13:47:26 2013 +0530

    Dedicate guest vlan range to account

commit 12c79c8377
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 12:02:32 2013 +0530

    scale up virtual machine response change in the backend

commit 94bac27622
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Sun May 5 09:58:04 2013 +0530

    appliance: Upgrade systemvm appliance from rc1 to Debian7 GA

    Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

commit c598bb0038
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sun May 5 01:57:35 2013 +0530

    CLOUDSTACK-2076:Listview widget infinte scrolling error

commit d0615ea9a1
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 01:15:14 2013 +0530

    CLOUDSTACK-2274:Detail view loading problem when deleting a zone

commit 733b513c3a
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sat May 4 13:41:02 2013 +0530

    CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab

commit 418d75d7a4
Author: Marcus Sorensen <marcus@betterservers.com>
Date:   Fri May 3 14:09:52 2013 -0600

    Summary: Release old DHCP entries

    Detail: Refresh dnsmasq with updated entries live, no outage

    BUG-ID: CLOUDSTACK-2299
    Submitted-by: Dennis Lawler <dlawler@gmail.com>
    Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367611792 -0600

commit b3dce64577
Author: Kelven Yang <kelveny@gmail.com>
Date:   Tue May 7 10:57:19 2013 -0700

    fix unitest

commit b17885f0f6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 09:55:47 2013 -0700

    InternalLb: some fixes to the unittest

commit 1cff609347
Merge: 053e184 a3a5c13
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:23:08 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java

commit 053e18454d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:07:07 2013 -0700

    InternalLB: marvin integration test for internal lb feature

commit 2e8e2f98f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 13:53:20 2013 -0700

    InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa

commit c773d204c8
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed May 1 13:21:52 2013 -0700

    Internal LB: if we detect that we are inside an internal lb vm, call out to the ilb script to perform LB configuration

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 8c8845bf77
Merge: 7e95545 471ca30
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:14:06 2013 -0700

    Merge branch 'master' into internallb1

commit 7e9554596f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:01:16 2013 -0700

    InternalLb: boot args parameters cleanup for the internal lb vm

commit b7cf870074
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 30 10:31:28 2013 -0700

    InternalLb: more unittests for internal lb element

commit 63bb98ebe2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 18:29:25 2013 -0700

    allow ssh on eth1

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit ca1c313c29
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:58:45 2013 -0700

    InternalLb: DB upgrade - update existing physical networks with InternalLbVm provider

commit ed50caa01c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:48:36 2013 -0700

    InternalLbVM: handle the scenario when sourceIpAddress is not passed when create internal Lb rule

commit 4c22c911a9
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 15:56:00 2013 -0700

    backend support for Internal LB

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 7b24a7640c
Merge: 440e848 a0dbf89
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 15:49:48 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/api/query/QueryManagerImpl.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit 440e8484d6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 13:27:06 2013 -0700

    InternalLB: unittests for InternalLoadBalancerVMManager

commit 63babe4b7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 26 13:44:01 2013 -0700

    InternalLb:

    1) Added unittests for InternalLoadBalancerVMService
    2) Added unittests for InternalLoadBalancerElementService

commit 4f9c47ce54
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 25 14:46:42 2013 -0700

    InternalLb: create internal lb vm specific service offering

commit 408ee59d1f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb: new set of Web services APIs for managing Internal LB VMs

commit 7680e1cc10
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb:

    1) InternalLb and PublicLb can't be enabled on the same network offering
    2) Can have internalLb only on VPC tier

commit d73ca7ef73
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 13:02:32 2013 -0700

    InternalLb:
    1) fixed the bug when the guest nic on internal lb vm wasnt set to be default
    2) Don't send the rules to the internal lb vm if its in Stopped state

commit ca2fc30655
Merge: 8057567 04a2b2d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 16:56:11 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit 8057567aaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 13:15:36 2013 -0700

    Internallb: more unittests for ApplicationLoadBalancerService

commit 35c0273b85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 19 16:17:45 2013 -0700

    InternalLb: unittests for ApplicationLoadBalancerService

commit 69b23f7003
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 14:01:10 2013 -0700

    InternalLb: create/configure/listInternalLoadBalancerElement - fixes to the API response

commit a3321ce617
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 13:31:16 2013 -0700

    Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl

commit 2baf7c365c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 10:02:17 2013 -0700

    Internallb: verify requested IP for LB rule (if specified) against guest network cidr

commit 0cfe96bd00
Merge: 501f2ff 11162f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 17 15:41:51 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	setup/db/db/schema-410to420.sql

commit 501f2ffa0b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 17:03:50 2013 -0700

    InternalLb: validate source ip network as a part of LB rule creation

commit 4d9a7dfd85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 16:03:32 2013 -0700

    InternalLB: in VPC, restrict public LB to one tier only. Internal LB can be supported on multiple tiers

commit 8689bf9eb3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 15:59:56 2013 -0700

    Internal LB: added internal lb vm to the list of supported providers in VPC default offering

commit b7709b89ff
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 11:04:22 2013 -0700

    Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network

commit 014689e45e
Merge: b3b16ba 90e8158
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 09:55:45 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit b3b16bae48
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 17:00:31 2013 -0700

    InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network

commit a4fc1d7d65
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 13:45:25 2013 -0700

    Internal LB:

    1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
    2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB

commit 4530cebf2b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 10:06:10 2013 -0700

    InternalLbVm: support for start/stop Internal lb vm

commit ae69f0ae56
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 17:25:02 2013 -0700

    InternalLb: fixed prepare() in InternalLbElement - have to prepare nics of User vms only

commit 888a83c221
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:58:27 2013 -0700

    InternalLb: Start/deploy internal LB vms for the existing LB rules as a part of network implement

commit 3b41d5bee1
Merge: bb73531 4b1a9f1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:32:40 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java

commit bb73531fed
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:13:55 2013 -0700

    Internal Lb: list internal lb vms as a part of listRouters response. Introduced new parameter - role (can be virtual_router or internal_lb_vm)

commit c113ea184b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 12:00:09 2013 -0700

    Add Internal Lb Provider/Element as a part of adding a physical network

commit 78c9db79da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 10:05:28 2013 -0700

    InternalLbVm: destroy the internal lb vm when the last rule for the ip is being revoked

commit af6201257b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 16:55:37 2013 -0700

    Internal LB: fixed some bugs in internal lb vm startup process

commit 1db240c2b6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:23:55 2013 -0700

    InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl

commit 3795048fcc
Merge: f4c2b53 5f8a278
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:09:31 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiDBUtils.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit f4c2b53c21
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 13:46:47 2013 -0700

    InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)

commit 76a4b1cf81
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 11:41:47 2013 -0700

    InternalLB: added logic for acquiring guest ip address for the Internal LB rule

commit 915e39fbaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 10:19:18 2013 -0700

    Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl

commit 3f2a62c7f6
Merge: 20beb7a a0b5ebc
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 17:16:07 2013 -0700

    Merge branch 'master' into internallb1

commit 20beb7a16c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:28:12 2013 -0700

    Internal LB: applyLoadBalancerRules - put not null check for sourceIpAddressId (can be null when Schema is not Public)

commit 87e5f5b9a6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:17:58 2013 -0700

    Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl

commit 53b9c0d142
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:55:10 2013 -0700

    Internal LB: added @Since to API docs for Internal LB related commands

commit 867b305ea8
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:51:19 2013 -0700

    Internal LB: Made InternalLbElement to extend the ip deployer as the LB service implements IPDeployerRequester

commit 7b9af28094
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 15:45:30 2013 -0700

    InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs:

    1) configureInternalLoadBalancerElement
    2) createInternalLoadBalancerElement
    3) listInternalLoadBalancerElements

commit 039e303d4a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 14:01:11 2013 -0700

    InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins.

commit f0018b4512
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 12:56:42 2013 -0700

    Internal LB:

    1)Added InternalLoadBalancerManager and corresponding Impl
    2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well

commit e344cf250a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:57:47 2013 -0700

    InternalLB - removed unused code from LoadBalancerDao

commit 3588f46848
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:23:03 2013 -0700

    Internal LB - added network-element plugin for internal lb service

commit 76325e6168
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 13:58:08 2013 -0700

    Internal Lb:

    1) When network has both kinds of LB rules - Public and Internal - never send them in the same set to the provider
    2) Added extra checks on the provider side to validate if the schema - Public or Internal - is supported.

commit 56c2fe1d37
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:34:59 2013 -0700

    InternalLB:

    1) Added new capability for the LB service - LbSchemes. Can take 2 values - Internal and Public.
    2) F5 and Netscaler LB providers - changes all LB related methods to accept LoadBalancingRule instead of ? extends FirewallRule.

commit 34bcb2d026
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:11:11 2013 -0700

    InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation

commit 9ab31e11f7
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 5 15:59:55 2013 -0700

    InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id

commit 08f855d4e4
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 4 09:26:21 2013 -0700

    InternalLB:

    1) Added new set of Interfaces - including the new VO - for the internal load balancer
    2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-05-09 11:54:41 -07:00
Brian Federle 2ac22efc5e Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-09 11:33:00 -07:00
Milamber 2e1877af33 CLOUDSTACK-2413 - Display the Name of compute offering in dialog box Change Service Offering (was Description field before) 2013-05-09 10:50:04 +01:00
Brian Federle c1e9e4de61 Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-08 10:47:54 -07:00
Pranav Saxena 305f3cb8a5 CLOUDSTACK-2387:Addition/Deletion of a VLAN Range from UI calls updateTrafficType API which makes all networklabels as undefined which finally results in failure to deploy VMs 2013-05-08 17:07:46 +05:30
Pranav Saxena 76e8afa24f CLOUDSTACK-2171:Unable to Create a VM In the VMware Setup with the latest Master 2013-05-08 17:05:36 +05:30
Brian Federle 5b74b4d6fe UI plugin API: Support IE-compatible CSS loading
If browser is IE < 9, use document.createStyleSheet to properly load
plugin's CSS dynamically.
2013-05-07 15:44:59 -07:00
Brian Federle 66337e8e9c Zone wizard: fix secondary storage dropdown event 2013-05-07 14:24:39 -07:00
Jessica Wang 25e992dc8e CLOUDSTACK-2348: PVLAN - UI - Infrastructure menu - guest network - add broadcast URI field to listView and detailView. 2013-05-07 13:04:04 -07:00
Jessica Wang e659819381 CLOUDSTACK-2351: object store - UI - zone wizard - add secondary storage step - implement provider S3, Swift. 2013-05-07 12:35:35 -07:00
Jessica Wang e0fa8e1e93 CLOUDSTACK-2351: object store - UI - cloudstack.js - replace listS3s, listSwiftsAPI with new API listImageStores. 2013-05-07 12:04:07 -07:00
Jessica Wang d9733e900d CLOUDSTACK-2351: object store - UI - infrastructure menu - secondary storages - detailView - delete action - replace deleteHost API with new API deleteImageStore. 2013-05-07 11:38:31 -07:00
Jessica Wang 79935f6eee CLOUDSTACK-2351: object store - UI - zone wizard - add secondary storage step - replace addSecondaryStorage API with new API addImageStore. 2013-05-07 11:11:30 -07:00
Jessica Wang 9f5d3c276d CLOUDSTACK-2351: object store - UI - Infrastructure menu - secondary storages - add secondary storage - implement provider S3. 2013-05-07 10:54:05 -07:00
Jessica Wang fdee284395 CLOUDSTACK-2351: object store - Infrastructure menu - secondary storages - add secondary storage dialog - implement Swift provider. 2013-05-06 17:57:52 -07:00
Jessica Wang a00e30cb16 CLOUDSTACK-2351: (1) object store - listStorageTypes API has been changed to return 'NFS'. Here is related UI change. (2) Infrastructure menu - secondary storages- add secondary storage dialog - fix a bug that this dialog failed to pop up when there is zero zone. 2013-05-06 17:18:49 -07:00
Jessica Wang eb4965ef63 CLOUDSTACK-2351: object store - UI - Infrastructure menu - secondary storages - add secondary storage - NFS provider - replace addSecondaryStorage API with new API addImageStore. 2013-05-06 16:57:23 -07:00
Wei Zhou af5bf94b43 CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-06 20:58:32 +01:00
Jessica Wang 87b7a84507 CLOUDSTACK-2348: PVLAN - UI - infrastructure menu - create guest network - add new field Private VLAN ID. 2013-05-06 12:14:19 -07:00
Brian Federle 2cd70d06b3 Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-06 10:40:08 -07:00
Pranav Saxena e6ae66d596 scaleUp VM response change corresponding UI changes 2013-05-06 14:08:40 +05:30
Pranav Saxena 63fbdbb96f CLOUDSTACK-2337:Resize button available for root/domain admin and normal users 2013-05-06 13:45:32 +05:30
Pranav Saxena b33b316755 scale up virtual machine response change in the backend 2013-05-05 12:02:32 +05:30
Isaac Chiang a9f0fb8009 CLOUDSTACK-2076:Listview widget infinte scrolling error 2013-05-05 01:57:35 +05:30
Pranav Saxena 5811ae7e25 CLOUDSTACK-2274:Detail view loading problem when deleting a zone 2013-05-05 01:15:14 +05:30
Isaac Chiang 63f3ccd4df CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab 2013-05-04 13:41:02 +05:30
Pranav Saxena 3087bf7e5b CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings 2013-05-03 11:21:00 +05:30
Pranav Saxena 324b4f680c CLOUDSTACK-2041:Granular global parameter- Storage Pool granular settings 2013-05-03 11:16:15 +05:30
Mice Xia d7cab21e9a 1) rename RevertToSnapshotCmd->RevertToVMSnapshotCmd 2) add marvin test for vm snapshot 2013-05-03 12:32:53 +08:00
Brian Federle ac07a54a7e Merge branch 'master' into ui-cisco-asa1000v-support 2013-05-02 10:30:40 -07:00
Pranav Saxena 1206fd6b4e Widget change to incorporate VM state while adding a load balancer rule 2013-05-02 22:25:47 +05:30
Pranav Saxena ba9feabe8c Widget change to incorporate VM state while adding a load balancer rule 2013-05-02 21:02:51 +05:30
Pranav Saxena 4933533893 CLOUDSTACK-2041:Granular global parameter- secondary storage settings not needed 2013-05-02 20:11:17 +05:30
Pranav Saxena 22a5c6d4b3 CLOUDSTACK-2041:Granular global parameter- Account settings 2013-05-02 20:06:20 +05:30
Pranav Saxena d91b0f2f6d CLOUDSTACK-2041:Granular global parameter- Cluster settings 2013-05-02 18:23:35 +05:30
Pranav Saxena 61f3f931dd CLOUDSTACK-2041:Granular global parameter- Zone settings 2013-05-02 17:37:01 +05:30
Pranav Saxena 6e2ecff4f5 Merge remote-tracking branch 'remotes/origin/ui-granular-settings' 2013-05-02 17:31:22 +05:30
Brian Federle c1de600cb4 Merge branch 'master' into ui-granular-settings 2013-05-01 14:45:05 -07:00
Jessica Wang 50a3c918c8 CLOUDSTACK-2120: mixed zone management - UI - instances.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:44:58 -07:00
Jessica Wang 4c7e0b308a CLOUDSTACK-2120: mixed zone management - UI - storage.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:41:39 -07:00
Jessica Wang 57167d2ca6 CLOUDSTACK-2120: mixed zone management - UI - templates.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:38:23 -07:00
Pranav Saxena fd2ae034f5 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack 2013-05-02 02:59:36 +05:30
Pranav Saxena 58648c4b53 CLOUDSTACK-2175: Add private Gateway can aonly be done by root or domain admin but not by normal user 2013-05-02 02:58:27 +05:30
Jessica Wang 60a8e881c1 CLOUDSTACK-2120: mixed zone management - UI - system.js - remove obsolete code that has been replaced with new change in global function createURL(). 2013-05-01 14:22:35 -07:00
Jessica Wang 996d2f5a2b CLOUDSTACK-2074: UI - affinity groups - VM wizard under Affinity Groups menu - step 5(select affinity group step) - make corresponding affinity group checked by default. 2013-05-01 14:07:23 -07:00
Pranav Saxena 38071e63d2 CLOUDSTACK-2113:Router VM scale up UI support 2013-05-02 02:33:27 +05:30
Brian Federle 1a4a319d32 VM wizard: Show message if no affinity groups are available. 2013-04-30 13:30:40 -07:00
Brian Federle eacbb4cb2d Merge branch 'master' into ui-add-remove-nics
Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/dictionary.jsp
2013-04-30 11:57:38 -07:00
Pranav Saxena 6bf67c9f68 CLOUDSTACK-2113:System VM scaleUp UI support 2013-04-29 16:21:49 +05:30
Brian Federle 6b1da42221 Detail view, multi-group actions: Prevent refresh of all tabs
Prevent call to updateTabContent, which will switch the detail view
off the current tab on action complete.
2013-04-26 15:32:15 -07:00
Brian Federle 86a9f27692 Detail view/instances section: Fix context, add makeDefault action
-Add 'makeDefault' action to set default NIC

-Fix context passing for multi-actions, which wasn't passing the correct
 nic object previously.
2013-04-26 15:21:57 -07:00
Brian Federle c02a4b9c7f Fix remove NIC UI behavior 2013-04-26 13:42:56 -07:00
Brian Federle b7b7753f1d Fix detail view 'add action' for multi-group tab 2013-04-26 12:37:08 -07:00
Brian Federle 3b758d176e Merge branch 'ui-add-remove-nics' of https://git-wip-us.apache.org/repos/asf/cloudstack into ui-add-remove-nics 2013-04-26 12:29:54 -07:00
Brian Federle c45fd05f6b Merge branch 'master' into ui-add-remove-nics 2013-04-26 11:37:52 -07:00
Jessica Wang 3e2eb59723 CLOUDSTACK-2120: mixed zone management - UI: make global function changeURL() to pass zonetype to API calls based on selected option in zone type dropdown on top menu. 2013-04-26 11:26:21 -07:00
Brian Federle ae79d782ec Add remove NIC API calls 2013-04-26 10:48:25 -07:00
Pranav Saxena 3a9001bfb6 Correcting the case for secondary storage limit 2013-04-26 14:18:40 +05:30
Jessica Wang 64635abba5 CLOUDSTACK-1910: UI- Regions menu - GSLB - View assigned load balancing - refresh data. 2013-04-25 16:03:02 -07:00
Jessica Wang 6f60833f93 CLOUDSTACK-2120: mixed zone management - (1) extend listRouters API to to take in zonetype. (2) UI: populate Routers list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of Routers based on selected option in zone type dropdown on top menu. 2013-04-25 15:10:33 -07:00
Jessica Wang f883b0f904 CLOUDSTACK-2120: mixed zone management - UI: count total number of Primary Storages, Secondary Storages based on selected option in zone type dropdown on top menu. 2013-04-25 14:25:34 -07:00
Brian Federle eab667f266 Merge branch 'master' into ui-add-remove-nics 2013-04-25 11:25:52 -07:00
Jessica Wang e8b6c7b33d CLOUDSTACK-2120: mixed zone management - UI: count total number of hosts based on selected option in zone type dropdown on top menu. 2013-04-25 11:14:20 -07:00
Brian Federle 18a337270d Merge branch 'master' into ui-add-remove-nics 2013-04-25 11:09:51 -07:00
Brian Federle 5ce289034d Merge branch 'ui-vm-affinity' 2013-04-25 11:04:35 -07:00