Commit Graph

16989 Commits

Author SHA1 Message Date
Alena Prokharchyk 4dd71cb635 VPC: CS-15562 - get info about VR's guest networks from nics table 2012-07-13 13:35:18 -07:00
Alena Prokharchyk 534e6d4d80 VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
Conflicts:

	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-07-13 13:35:06 -07:00
Alena Prokharchyk d48d4c24e7 VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:34:19 -07:00
Alena Prokharchyk ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
2012-07-13 13:32:14 -07:00
Alena Prokharchyk 1781f706f9 VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc 2012-07-13 13:27:10 -07:00
Alena Prokharchyk b475396438 VPC: CS-15550 - fixed listVPCs by cidr
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 13:26:59 -07:00
Alena Prokharchyk eb52f4a610 VPC: mark gateway with Deleting state when all static routes are gone 2012-07-13 13:26:04 -07:00
Alena Prokharchyk 5923659dba VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state 2012-07-13 13:25:56 -07:00
Alena Prokharchyk b15c2576a7 VPC: fixed listStaticRoutes when search by gatewayId 2012-07-13 13:25:47 -07:00
Alena Prokharchyk a848ecae8b VPC: fixed logging 2012-07-13 13:25:39 -07:00
Prasanna Santhanam 3d7f6a35ad CS-15560 : Improve HVM logging of hosts
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
2012-07-13 10:51:56 -07:00
Pranav Saxena 374be31b63 CS-15572 : StartIndex handled incorrectly when switching between the various Filter by options while listing ISOs in the UI 2012-07-13 12:32:38 +05:30
Pranav Saxena 64cfdc5254 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-13 12:29:16 +05:30
Brian Federle 50373b99d6 Detail view: Fix layout of text actions 2012-07-12 15:29:15 -07:00
Brian Federle 2a971d7c1b Detail view UI: Support for text action buttons
Currently, only icons are rendered on detail view actions. This change
adds support for showing a text label next to specified actions, which
has a button appearance. This is to allow certain actions to be more
visible, in the case where an icon isn't clear enough.

To make an action have a text label, add a 'textLabel' attribute to
the action properties:

editVpc: {
  label: 'Edit VPC',

  // textLabel property
  textLabel: 'label.configure',

  action: {
    ...
  }
}
2012-07-12 15:29:15 -07:00
Brian Federle 9b039d9a8d List view UI: Support for text action buttons
Currently, only icons are rendered on list view actions. This change
adds support for showing a text label next to specified actions, which
has a button appearance. This is to allow certain actions to be more
visible, in the case where an icon isn't clear enough.

To make an action have a text label, add a 'textLabel' attribute to
the action properties:

editVpc: {
  label: 'Edit VPC',

  // textLabel property
  textLabel: 'label.configure',

  action: {
   ...
  }
}
2012-07-12 13:46:19 -07:00
chip.childers@gmail.com c04a8308ff Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-12 09:32:23 -04:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Edison Su 8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Edison Su ed4b6a517b the default templates are put into download.cloud.com 2012-07-11 15:19:21 -07:00
Brian Federle dd57e8bb38 VPC UI: CSS fixes
-Fix hover state for virtual router block -- should not have a
 highlight effect

-Add gray BG for multi-edit header area, for VPC PF/LB form

-Remove border around static NAT tier select
2012-07-11 14:04:56 -07:00
Alena Prokharchyk 79d277c30d VPC: fixed listPrivateGateways by id 2012-07-11 13:22:50 -07:00
Alena Prokharchyk ef8208af00 Merge branch 'master' into vpc 2012-07-11 13:18:51 -07:00
Alena Prokharchyk ab2669b01d CS-15459: fixed listTags by resourceType 2012-07-11 12:08:34 -07:00
Alena Prokharchyk 7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00
Alena Prokharchyk d2e491a377 VPC: don't send staticRoutes in Revoke state to the VPC VR 2012-07-11 12:05:33 -07:00
chip.childers@gmail.com 5f4728beb6 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
Conflicts:
	tools/devcloud/devcloudsetup.sh
2012-07-10 22:29:15 -04:00
Sheng Yang 37ab2dd49b S2S VPN: Add privilege for normal users on list commands 2012-07-10 18:58:33 -07:00
Alena Prokharchyk b407b3beaa VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up 2012-07-10 18:07:45 -07:00
Alena Prokharchyk 697aa4589b VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
Conflicts:

	api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-10 18:07:09 -07:00
Edison Su d3c0110d0e add trust="yes" option to ssh tasks
ant r* targets would error out if you haven't added a host entry
for devcloud. This fixes the problem by trusting it.

Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>
2012-07-10 17:05:10 -07:00
Edison Su fb59fc5c8a disable virtualbox dhcp server for Vms created by cloudstack 2012-07-10 16:20:20 -07:00
Brian Federle 262bbbe800 Add block to show/hide tier select
-- Hidden by default, needs real conditional code
2012-07-10 15:41:23 -07:00
Brian Federle 9f093817f3 Implement static NAT tier select UI
Adds a new drop-down to the enable static NAT dialog to allow selecting a tier to be associated with the VM. This is in the header of the list view.

It is defined as follows:

enableStaticNAT: {
  ...
    action: {
      noAdd: true,
      custom: cloudStack.uiCustom.enableStaticNAT({
        // VPC
        tierSelect: function(args) {
          args.response.success({
            data: [
              { id: '1', description: 'VPC 1' },
              { id: '2', description: 'VPC 2' }
            ]
          });
        },
    ...
2012-07-10 15:41:23 -07:00
Alena Prokharchyk f59b935da5 VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
2012-07-10 15:20:39 -07:00
Brian Federle c87501d8ae Fix placement of header 2012-07-10 14:58:06 -07:00
Brian Federle 5b8f5d6ae3 multiEdit: Correctly pass context to header fields 2012-07-10 14:57:07 -07:00
Brian Federle dd52157f09 Add code to show/hide 'tiers' header fields 2012-07-10 14:57:07 -07:00
Brian Federle 5fa4f4cf37 Pass mulit-edit form data to add VM dialogs, as part of context 2012-07-10 14:57:06 -07:00
Brian Federle 04ac28202f Multi-edit: refactor form serialization
To support header-level form items, serialize every form within the
multi-edit div (not just the main table form). For reusability, make
data serialization handled in separate 'getMultiData' function.
2012-07-10 14:57:06 -07:00
Brian Federle 7de02b6d5c Update dummy tier data 2012-07-10 14:57:05 -07:00
Brian Federle 081f1e335d Add header fields 2012-07-10 14:57:05 -07:00
Sheng Yang ade3ae4e3c CS-15512: Fix delete vpn connection 2012-07-10 14:47:50 -07:00
Alena Prokharchyk c2f9417de4 VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method 2012-07-10 14:35:50 -07:00
Brian Federle b000b8047e CS-15475: Fix missing 'add guest network' action from network list
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-10 11:24:07 -07:00
Edison Su 3bbb694413 For devcloudsetup.sh:
Added dom0 memory settings to grub config.
    Added root password reset.
    Install xen ia32 instead of amd64, to 32bit compability
Send-by: chip.childers@sungard.com
RB: https://reviews.apache.org/r/5877/
2012-07-10 11:18:32 -07:00
Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
2012-07-10 10:38:17 -07:00
Pranav Saxena 9eebdd808d CS-15475:Not showing Add GuestNetwork Tab in Network in multi zone setup of advanced and basic zones together 2012-07-10 15:40:14 +05:30
Pranav Saxena 692e8fb98c Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-10 15:36:24 +05:30
Chip Childers 7488b9d752 For devcloudsetup.sh:
Added dom0 memory settings to grub config.
Added root password reset.
2012-07-09 23:27:01 -04:00