7a9277299a
Corrected the check for baremetal
2013-05-16 14:24:44 -07:00
0d23cd3c9e
If hypervisortype is baremetal, need to make sure we choose the correct planner
2013-05-16 13:40:44 -07:00
db4f335c8a
Merge branch 'master' into planner_reserve
2013-05-16 11:56:37 -07:00
d078f92167
CLOUDSTACK-2544: Fix NPE while comparing lastHostId during capacity calculation
2013-05-16 19:14:41 +05:30
f441582e1b
CLOUDSTACK-2378: assignToGSLBRule or removeFromGlobalLoadBalancerRule APIs are failing when there are multiple physical network in a zone
...
adding support for deployments where multiple physical networks are configured for guest traffic in a zone
2013-05-16 18:26:14 +05:30
d2d0398e33
CLOUDSTACK-2529: GlobalLoadBalancerResponse should have the full FQDN
...
for the global load balanced service
2013-05-16 15:19:41 +05:30
e26442f7d0
instead of '==', use equals() to compare two strings in cloud-server
2013-05-16 16:18:53 +08:00
6d57393629
instead of using '==', use equals() to test Long value equality
2013-05-16 16:00:02 +08:00
e260817318
CLOUDSTACK-2130: UpdateDefaultNicForVirtualMachine api should also create usage events for updating new default network
...
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
2013-05-16 14:22:36 +08:00
2d2c0c48cd
Merge branch 'pvlan'
...
Conflicts:
scripts/vm/hypervisor/xenserver/xenserver60/patch
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/NetworkServiceImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
ed8ff40f7f
Merge branch 'master' into planner_reserve
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
setup/db/db/schema-410to420.sql
2013-05-15 14:44:56 -07:00
ddd7cfd71c
CLOUDSTACK-2519: VMs on local storage incorrectly destroyed when removing another host using deleteHost API
...
- For DeleteHost API: Search for Volumes in READY state on the local storage of the host to find VM's in 'Running' State
- For PrepareForMaintenance API: Search for Volumes not in Destroy or Expunging state to check if the Local Storage on the host is being used.
2013-05-15 13:28:41 -07:00
9f59c618e2
CLOUDSTACK-2517: fixed private gateway creation. Following fixes went in:
...
1) Only PrivateNetworkGuru handles network creation for the private gateway. Exluded Guest Network Guru from this list (was mistakenly included as a part of merge for Nicira integration)
2) Pass vpc_id to createNetwork call when the network is created as a part of private gateway creation
3) Fixed VPC restart when there are multiple private gateways present (have to grab all the private gateways when creating nic profiles for the VPC router that is being re-created)
4) 41-42 db upgarde: set vpc_id for the private networks of the existing VPCs
2013-05-15 13:12:51 -07:00
8f7a51ee5f
CLOUDSTACK-962: Because of the same reason to this (CLOUDSTACK-685)
...
https://reviews.apache.org/r/11157/
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-05-15 16:39:22 +01:00
36a312d4b2
CLOUDSTACK-2134 updated acl checks for aquiring nic secondary ip
2013-05-15 18:08:15 +05:30
f893aa8a78
CLOUDSTACK-2116
...
Public IP addresses resource count of an account - number of ip addresses dedicated to an account
plus the number of ip addresses belonging to the system that have been allocated to the account
2013-05-15 18:05:01 +05:30
9b6513466f
CLOUDSTACK-2369 fixed adding same private gw twice
2013-05-15 16:45:52 +05:30
7370638915
CLOUDSTACK:685 Fix user stat collection in PrepareStop part of VirtualNetworkApplianceImpl
2013-05-15 16:45:52 +05:30
9542f10592
CLOUDSTACK-1904: API : UI : Admin can not delete Events/Archive from other accounts
2013-05-15 15:28:37 +05:30
24cdddbf5e
CLOUDSTACK-2459 Fix the scale vm tests
2013-05-15 14:25:39 +05:30
39caa0ebdd
Updated network acl service test to avoid default ACL modification
2013-05-15 14:20:29 +05:30
3388b77156
CLOUDSTACK-2487: Show error while adding acl_item to default ACL
2013-05-15 12:51:08 +05:30
26cefdcfac
When UUID field is null for existing records, set it to id
...
Conflicts:
server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
2013-05-14 15:11:41 -07:00
46f8b6f34a
CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway
2013-05-14 16:11:33 +05:30
c94c71b4ce
CLOUDSTACK-2441: Fix deleting private gateways while deleting vpc in case multiple private gateways
2013-05-14 16:10:38 +05:30
dfdc089668
CLOUDSTACK-2465: fixed network creation in VPC - removed extra call to createGuestNetwork introduced by the NetworkACL feature merge
2013-05-13 15:28:08 -07:00
065d2561b9
CLOUDSTACK-2392: Not allow create pvlan network with ipv6
2013-05-13 11:40:40 -07:00
2d950e2858
CLOUDSTACK-768: ACL on private gateway
2013-05-13 19:24:23 +05:30
bcc320f8b0
Scale vm test failing..commented for now to unblock all. Will open a bug for the same
2013-05-13 18:32:01 +05:30
573f529ea0
mvn install didnt point me the compilation errors...fixing them
2013-05-13 18:18:56 +05:30
f84b6abde0
merge with master
2013-05-13 17:30:42 +05:30
052c24c4d1
CLOUDSTACK-702: Multiple ip ranges in different subnets.
...
This feature enables adding of guest ip ranges (public ips) form different subnets.
In order to provide the dhcp service to a different subnet we create an ipalias on the router. This allows the router to listen to the dhcp request from the guest vms and respond accordingly. Every time a vm is deployed in the new subnet we configure an ip alias on the router. Cloudstack uses dnsmasq to provide dhcp service. We need to configure the dnsmasq to issue ips on the new subnets. Added a new class dnsmasqconfigurator which generates the dnsmasq confg file, this file replaces the old config in the router.
The details of the alias ips are stored in db in the nic_ip_alias table. Every time a new subnet is added one of the ip from the subnet is used to configure the ip alias.
I have pushed the code to https://github.com/bvbharatk/cloud-stack/tree/Cloudstack-702 , also rebased the code with master.
I need to test the code for advanced sg enabled network using kvm.
I have added the unit test
Marvin tests are at https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=53e4965
Also accomodated some of the changes suggested by koushik.
corrected the import statements. renamed the IpAlias command to createIpAlias command.
This feature supports only ipv4
2013-05-13 17:06:44 +05:30
8d53b1ef05
merge with master
2013-05-13 16:36:41 +05:30
595f78f0f7
update APICmd imports
2013-05-13 12:03:39 +05:30
5e009c4bcd
CLOUDSTACK-763: Added comments and removed unused imports
2013-05-13 12:03:39 +05:30
5e1d216197
CLOUDSTACK-763: Added unit tests and integration test
2013-05-13 12:03:39 +05:30
14e992e953
CLOUDSTACK-763: Removed unused methods
2013-05-13 12:03:39 +05:30
49fbff21fa
CLOUDSTACK-763: Added API updateNetworkACLItem to update an existing ACL Item
2013-05-13 12:03:39 +05:30
b30a01a705
CLOUDSTACK-763: Added acl_id param to createNetwork API. Backend changes for acl_deny. Support for all protocol and protocol number
2013-05-13 12:03:38 +05:30
750bfe76ca
CLOUDSTACK-763: Added filters to list APIs. Seperated service interface implementation to NetworkACLServiceImpl. Added default ACL to upgrade schema
2013-05-13 12:03:38 +05:30
3322063067
CLOUDSTACK-763: Fixed source CIDR and apply ACL items
2013-05-13 12:03:38 +05:30
e2449cfcf0
CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number
2013-05-13 12:03:38 +05:30
ebf8a7fd1e
CLOUDSTACK-763: Added APIs to create, delete and list NetworkACLlist.
2013-05-13 12:03:38 +05:30
941a9a5fb7
license check
2013-05-12 14:42:59 +05:30
5f0f1001be
remove unwanted files
2013-05-12 14:30:10 +05:30
e107776d75
build master
2013-05-12 13:14:33 +05:30
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
836a3f1252
add missing file
2013-05-11 15:02:12 +05:30
5f9263b161
fix build
2013-05-11 14:27:19 +05:30
1731a4a442
Add the new APIs along with tests
2013-05-11 14:13:38 +05:30
Prachi Damle
Kishan Kavala
Murali Reddy
Mice Xia
Saksham Srivastava
Sheng Yang
Alena Prokharchyk
Wei Zhou
Jayapal
Likitha Shetty
Sanjay Tripathi
Nitin Mehta
Bharat Kumar