17897 Commits

Author SHA1 Message Date
Brian Federle
4ce76429e2 Add internal LB count to VPC chart 2013-05-21 16:16:27 -07:00
Brian Federle
d019359d59 Merge branch 'master' into ui-vpc-redesign 2013-05-21 16:02:12 -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
0a443697ea Add base internal LB provider module 2013-05-21 15:26:59 -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
Sheng Yang
92ad6abab0 PVLAN: Fix NPE when VM are in allocated state
If vlan is not assigned for VM, nic.getBroadcastUri() would be null. Then just
ignore it.
2013-05-21 14:51:35 -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
Brian Federle
e35f14439a Merge branch 'master' into ui-vpc-redesign 2013-05-21 12:30:01 -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
Girish Shilamkar
2bc88ea277 CLOUDSTACK-778: Add tests for user provided hostname for vms
Automation tests to qualify User provides hostname feature.
1. Defines services class
2. Test to verify custom hostname for the instance with internal name
3. Test to verify custom hostname for the instance without internal name

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 20:27:26 +05:30
Girish Shilamkar
b74d13f9b1 CLOUDSTACK-2472: Fix unresolved reference to max_value
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:31:52 +05:30
Girish Shilamkar
1736031fcb CLOUDSTACK-2473: Fix a typo in test_vpc_network.py
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:28:22 +05:30
Girish Shilamkar
a8975f9522 CLOUDSTACK-2474: Remove garbage code which was added while resolving merge conflicts.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 19:25:58 +05:30
Wido den Hollander
37308ebff4 debian: Create the webapps7080 directory 2013-05-21 14:36:03 +02:00
Bharat Kumar
79dc83d1ac blocker bug in dnsmaq config
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-05-21 17:49:05 +05:30
Wido den Hollander
730e6571f6 debian: Packaging fixes for AWSAPI 2013-05-21 13:20:44 +02:00
Nitin Mehta
a58ee74e1c CLOUDSTACK-2567 - Check whether DMC - dynamic memory control is enabled for the hyervisor before trying to scale the vm. If its not then dont scale and instead throw and exception. 2013-05-21 16:39:25 +05:30
Pranav Saxena
e5e41b0f45 Remove ACL List action item 2013-05-21 16:35:14 +05:30
Prasanna Santhanam
2adc8e9a03 Adding docstrings for the portablip test
1. Test to create a portable public ip range
2. Test to acquire a provisioned public ip range

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 15:26:23 +05:30
Prasanna Santhanam
5fb1a16109 Fix apidocs build
Portable IP section added post portable IP merge

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 15:19:28 +05:30
Likitha Shetty
eb92135d55 CLOUDSTACK-2603. EC2RunInstances return xen or ovm as the response value for attribute "hypervisor" 2013-05-21 15:15:35 +05:30
Devdeep Singh
904a2a87f7 CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh. Made changes to read the parameter from config and to pass it to the resource.
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2013-05-21 13:33:07 +05:30
Dave Brosius
9350441dd3 remove bogus self assign to parent
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:19:03 +05:30
Likitha Shetty
6217b0fb4c CLOUDSTACK-2600. Fix CS AWSAPI to add the below filters that are missing in DescribeImages API-
architecture
description
image-id
image-type
is-public
name
owner-id
state
tag-key
tag-value
tag:key
hypervisor
2013-05-21 12:10:52 +05:30
Prasanna Santhanam
218d26be60 Adding the 'advanced' attribute for test_public_ip_range
Fixing typo in class name.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 12:04:03 +05:30
Sanjay Tripathi
55c384651a CLOUDSTACK-2305: [Automation] NPE: not able to create volume from snapshot
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-05-21 12:00:49 +05:30
Dave Brosius
49faa002e2 code compares Long values with == which will work for Long cached values
Fixed by switch to use .equals

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 11:45:10 +05:30
Dave Brosius
45d2e60656 Nop assignment due to missing 'this.'
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-21 11:43:25 +05:30
Likitha Shetty
503392119d CLOUDSTACK-2599. Fix EC2 Rest to support tag related EC2 API's - CreateTags/DeleteTags/DescribeTags 2013-05-21 11:33:33 +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
Sheng Yang
eb7c321426 PVLAN: CLOUDSTACK-2401: VM Migration support 2013-05-20 16:43:24 -07:00
Hiroaki Kawai
7260e8d83f CLOUDSTACK-1638: Introduce NetworkMigrationResponder
The location of the virtual machine is provided by DeployDestination, which will
be passed in NetworkGuru#reserve and NetworkElement#prepare.

During the virtual machine migration, it actually changes DeployDestination and
it looks like that it will tell that event to network components as it has
NetworkManager#prepareNicForMigration. The problem is that althogh the interface
has that method, NetworkManagerImpl does not tell the DeployDestination changes
to network components.

So IMHO, we need to add calls of NetworkGuru#reserve and NetworkElement#prepare
in NetworkManagerImpl#prepareNicForMigration . And then, we also need to add
calls NetworkGuru#release and NetworkElement#release after the migration,
otherwise the network resources that plugin reserved will be kept even when the
vm leaves off.

(Sheng Yang: rebase code, add license header)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-05-20 16:43:18 -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