5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
8d38f4e051
CS-15167: AWS API calls do not honor the "admin" accounts ability to view/act on the resources owned by regular users.
2012-07-06 16:00:27 -07:00
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
818a3c72ac
VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
2012-07-06 14:57:26 -07:00
47ea9f254c
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-06 17:28:38 -04:00
32fef61ac2
[Defect / Enhancement / New Feature] CS-15281 : Removal of third party dependencies in Citrix code base
2012-07-06 17:28:29 -04:00
ca231fe8be
CS-15401: Fix arrow BG for PF/LB UI for Japanese language
...
When opening Network screen, arrows to the right side of "show all"
for firewall, load balancer and port forwarding are divided in
Japanese localized environment. This fix adjusts the CSS to fit longer
characters in this condition.
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
Reviewed by: Brian Federle <brian.federle@citrix.com>
2012-07-06 14:04:08 -07:00
353423acec
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/dao/NetworkDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-06 12:04:10 -07:00
85677b71fe
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
...
Conflicts:
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
2012-07-06 11:43:31 -07:00
710fa36bfd
CS-15474: fixed response name for the deleteTags API
2012-07-06 11:43:31 -07:00
ec26e836fc
CS-15459: fixed listTags for userVms
2012-07-06 11:43:31 -07:00
7acf8585b1
Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed
...
2) added "tags" request parameter to the banch of list* Api commands (listVirtualMachines, listSnapshots - all commands are listed in the resource tags functional spec)
Conflicts:
api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
api/src/com/cloud/api/commands/ListSnapshotsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/api/response/FirewallResponse.java
api/src/com/cloud/api/response/IPAddressResponse.java
api/src/com/cloud/api/response/VolumeResponse.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
server/src/com/cloud/vm/dao/UserVmDaoImpl.java
2012-07-06 11:43:31 -07:00
7349842c42
CS-15116: Add missing scripts for XCP server
...
Thank for the help from Wilhem Putz(wp@typoheads.at ) to identify the issue.
2012-07-06 11:34:36 -07:00
d33429783f
Fixed deploydb
2012-07-06 11:18:16 -07:00
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
e1fe1616d7
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-06 11:09:56 -07:00
e19e26ec4e
VPC: don't fail when create/remove static route when VPC VR is in Stopped state
2012-07-06 11:09:15 -07:00
b13acc6459
VPC: don't allow vm to be a part of more than one VPC
2012-07-06 11:09:06 -07:00
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -07:00
83f566cfe7
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-06 11:08:48 -07:00
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
07eb6e3cf7
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-06 11:08:28 -07:00
b4fec75ff7
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
2012-07-06 11:08:17 -07:00
540ea34f57
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
2012-07-06 11:08:00 -07:00
0dfe603d48
VPC: createLB rule - removed duplicated check for ip services when createLB rule
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-06 11:07:26 -07:00
093af8a6a9
CS-15388: Fix labels
...
Labels for CPU/Mem (as found in compute offering window) are missing
the required values for CPU and RAM
Original patch by: Pranav Saxena <pranav.saxena@citrix.com>
reviewed-by: Brian Federle <brian.federle@citrix.com>
2012-07-06 10:27:09 -07:00
54203f08ad
Small stop-gap fix to include cloud-elb.jar and cloud-netapp.jar in the rpms
2012-07-06 10:06:46 -04:00
6cc8896f96
package statement was removed during a license update
2012-07-06 10:03:51 -04:00
57ab39937c
add script to setup devcloud image
2012-07-05 20:36:43 -07:00
81afcabdb2
Added missing package name mistakenly removed by headers cleanup checkin
2012-07-05 11:12:02 -07:00
471924ff11
adding a high level overview
2012-07-05 10:56:10 -04:00
27a23b2e2a
committing some bugfixes to runbook - thanks to Watnuss for pointing them out on IRC
2012-07-05 10:38:55 -04:00
a77b6756fc
more cleanups of license headers and attribution
2012-07-04 21:48:07 -04:00
5c3a8cd490
more license header cleanups
2012-07-04 21:41:50 -04:00
c0d5f86356
a bit more license header cleanup
2012-07-04 19:53:04 -04:00
53d5fe6636
fixing another license header
2012-07-04 19:47:12 -04:00
6fe595f3d3
committing some more changes to marvins license headers
2012-07-04 18:50:49 -04:00
54d7a10b99
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
2012-07-04 18:45:34 -04:00
ecf2cd57f9
fixing license headers in marvin
2012-07-04 18:45:08 -04:00
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
1f8e99439c
move to devcloud
2012-07-03 23:38:39 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
f2078afbd8
VPC: added zoneName to the VPC api response
2012-07-03 17:28:20 -07:00
07d478d836
VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:27:46 -07:00
023c2e4f59
Encrypting password values that are stored in the cluster_details table
2012-07-03 17:27:21 -07:00
b957933a0e
Making nexus vsm password encryptable
2012-07-03 17:26:05 -07:00
5afa83abb6
VPC: CS-15355 - fixed router when deployVm in Basic zone
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-07-03 17:25:07 -07:00
21d87f3fa5
VPC: fixed response tag for VpcRespnse
2012-07-03 17:23:50 -07:00
da6d876cd4
VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
server/src/com/cloud/api/ApiDBUtils.java
2012-07-03 17:23:40 -07:00
2b799aa9ac
VPC: added missing FirewallService to the VR provider
2012-07-03 17:22:41 -07:00
Alena Prokharchyk
Likitha Shetty
David Nalley
Pradeep Soundararajan
Brian Federle
Sheng Yang
Hugo Trippaers
Edison Su
Vijayendra Bhamidipati