14fa5279e2
Merge branch 'master' into vpc
2012-07-17 17:12:17 -07:00
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
2b2e491f27
CS-15572: Fix page index for list view filters
...
This fixes an issue where the page index is not reset back 1 when
activating the search or filter functionality, causing truncation when
trying to scroll down to later pages.
2012-07-17 11:41:53 -07:00
dfb0eed5a4
fix ubuntu 12.04 build
2012-07-16 18:00:05 -07:00
88205a7a83
Added ant target deploy-server-encrypt to enable encryption in dev setup
2012-07-16 16:11:44 -07:00
09e4b1683f
Added ant target deploy-server-encrypt to enable encryption in dev setup
2012-07-16 16:11:44 -07:00
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00
a3d4ee3d87
VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-16 15:42:36 -07:00
8a3a788d72
ant targets to run usage server
2012-07-16 15:00:37 -07:00
e874fdb24c
adding docs
2012-07-16 15:43:58 -04:00
b627f5a85b
Simplifying the process of running the simulator.
...
* ant run-simulator - will seed the simulator jar and start CS
* ant run-marvin -Dmarvin.config="/path/config/file" - will
* configure a
cloudstack as per the given configuration. marvin.config - defaults
to a
two host simulator in an advanced zone
You can then connect your debugger over localhost:8787 or use the CS
ui
at localhost:8080/client for testing.
From: Prasanna Santhanam(Prasanna.Santhanam@citrix.com )
2012-07-16 10:34:49 -07:00
ca43092830
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-14 11:50:03 -04:00
5611723b13
updating mailing list references
2012-07-14 11:45:40 -04:00
4a7149e6b5
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 17:09:16 -07:00
829acf6e27
CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator
2012-07-13 16:45:57 -07:00
7a5efcc2e8
CS-15579 - perform check when account/domainId is passed to list call by the regular user
2012-07-13 15:59:15 -07:00
a1acfd3bfa
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/network/Network.java
client/tomcatconf/components.xml.in
plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/guru/GuestNetworkGuru.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
setup/db/create-schema.sql
2012-07-13 13:52:58 -07:00
4dd71cb635
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:35:18 -07:00
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
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
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
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
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
eb52f4a610
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-13 13:26:04 -07:00
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
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
a848ecae8b
VPC: fixed logging
2012-07-13 13:25:39 -07:00
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
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
64cfdc5254
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-13 12:29:16 +05:30
50373b99d6
Detail view: Fix layout of text actions
2012-07-12 15:29:15 -07:00
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
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
c04a8308ff
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-12 09:32:23 -04:00
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
ed4b6a517b
the default templates are put into download.cloud.com
2012-07-11 15:19:21 -07:00
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
79d277c30d
VPC: fixed listPrivateGateways by id
2012-07-11 13:22:50 -07:00
ef8208af00
Merge branch 'master' into vpc
2012-07-11 13:18:51 -07:00
ab2669b01d
CS-15459: fixed listTags by resourceType
2012-07-11 12:08:34 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
d2e491a377
VPC: don't send staticRoutes in Revoke state to the VPC VR
2012-07-11 12:05:33 -07:00
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
37ab2dd49b
S2S VPN: Add privilege for normal users on list commands
2012-07-10 18:58:33 -07:00
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
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
Alena Prokharchyk
bfederle
Edison Su
kishan
David Nalley
Edison Su
anthony
Prasanna Santhanam
Pranav Saxena
Brian Federle
chip.childers@gmail.com
Hugo Trippaers
Edison Su
Sheng Yang