12456 Commits

Author SHA1 Message Date
Alena Prokharchyk
5a64d4fbb1 VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-20 17:12:34 -07:00
Jessica Wang
8712812ca7 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-07-20 16:49:17 -07:00
Jessica Wang
2a822de5e0 cloudstack 3.0 UI - multiEdit widget - make headerFields hidden as default. 2012-07-20 16:13:03 -07:00
Jessica Wang
f3841b3b8f cloudstack 3.0 UI - VPC - add LB rule - fix a JS error "args.context.networks is undefined" when configure stickiness. 2012-07-20 16:10:35 -07:00
Jessica Wang
1381fa46e1 cloudstack 3.0 UI - listView widget - pass context from caller function. 2012-07-20 16:05:11 -07:00
Jessica Wang
9176d13246 cloudstack 3.0 UI - VPC - infrasture page - network service providers - add "VPC Virtual Router". 2012-07-20 15:59:05 -07:00
Jessica Wang
254c05813c cloudstack 3.0 UI - VPC - add zone wizard - enable VpcVirtualRouter element, enable VpcVirtualRouter provider for advanced zone. 2012-07-20 15:49:13 -07:00
Jessica Wang
dc847ed832 cloudstack 3.0 UI - VPC - tier - implement "Add VM to tier" action. 2012-07-20 15:44:45 -07:00
Jessica Wang
20db2e515b cloudstack 3.0 UI - VPC - add network offering dialog - when service(s) has VPC Virtual Router as provider: (1) conserve mode is set to unchecked and grayed out. (2) redundant router capability checkbox is set to unchecked and grayed out. (3) remove Firewall service, SecurityGroup service. 2012-07-20 14:28:20 -07:00
Jessica Wang
ee9074a175 cloudstack 3.0 UI - VPC - sync VPC UI from citrix-hosted repo to apache-hosted repo. 2012-07-20 14:12:53 -07:00
bfederle
71bfeae487 Update VPC UI 2012-07-20 11:02:28 -07:00
Sheng Yang
e9ae7336c1 CS-15649: Remove DES from s2s vpn support policy
DES is considered INSECURE.
2012-07-20 10:53:42 -07:00
Sheng Yang
c0fcca3990 CS-15511: Not allow pfs parameter for customer VPN gateway 2012-07-19 15:10:31 -07:00
Alena Prokharchyk
281b23c2cd Fixed license headers 2012-07-18 14:52:13 -07:00
Alena Prokharchyk
6ad2388c72 VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
Sheng Yang
a1333649db CS-15536: Insert VPN mangle policy to FORWARD and OUTPUT
In order to get traffic tagged while ACL chain involved in PREROUTING chain.

Also using more generic tag checking in nat table.
2012-07-17 17:23:11 -07:00
Alena Prokharchyk
14fa5279e2 Merge branch 'master' into vpc 2012-07-17 17:12:17 -07:00
Alena Prokharchyk
519c4929bf VPC: fixed listPublicIpAddresses for the addresses with NULL network_id 2012-07-17 17:12:00 -07:00
Alena Prokharchyk
d51719ddc3 Fixed unittest 2012-07-17 15:50:56 -07:00
bfederle
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
Edison Su
dfb0eed5a4 fix ubuntu 12.04 build 2012-07-16 18:00:05 -07:00
kishan
88205a7a83 Added ant target deploy-server-encrypt to enable encryption in dev setup 2012-07-16 16:11:44 -07:00
kishan
09e4b1683f Added ant target deploy-server-encrypt to enable encryption in dev setup 2012-07-16 16:11:44 -07:00
Alena Prokharchyk
7c2b123d94 Merge branch 'master' into vpc 2012-07-16 15:43:16 -07:00
Alena Prokharchyk
097c260690 Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed 2012-07-16 15:43:06 -07:00
Alena Prokharchyk
47615a26b6 VPC: CS-15583 - hostName for the vm should be unique inside the network domain 2012-07-16 15:42:47 -07:00
Alena Prokharchyk
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
kishan
8a3a788d72 ant targets to run usage server 2012-07-16 15:00:37 -07:00
David Nalley
e874fdb24c adding docs 2012-07-16 15:43:58 -04:00
Edison Su
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
David Nalley
ca43092830 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2012-07-14 11:50:03 -04:00
David Nalley
5611723b13 updating mailing list references 2012-07-14 11:45:40 -04:00
Alena Prokharchyk
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
anthony
829acf6e27 CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator 2012-07-13 16:45:57 -07:00
Alena Prokharchyk
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
Alena Prokharchyk
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
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
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