etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,600 Commits 342 Branches 328 Tags 925 MiB
Commit Graph

72 Commits

Author SHA1 Message Date
Alex Huang e9953cd1a8 Fixed up unit testing to use only an in class TestConfiguration 2013-05-07 13:16:43 -07:00
Likitha Shetty d5cd3f7e00 Dedicate guest vlan range to account 2013-05-07 13:13:54 -07:00
Alena Prokharchyk 1cff609347 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-05-03 12:50:59 -07:00
Murali Reddy 0680fbdff3 CLOUDSTACK-2193: associateIpAddress is failing in "basic zone" that is 
enabled for EIP/ELB

restricting check that shared network should have services in orider to
associate ip, to advaced zone shared networks only. On basic zone shared
network associateIpAddress should work.
 2013-05-03 11:38:40 +05:30
Jayapal 1f1467974f CLOUDSTACK-1828 Source Nat on private gateway feature 2013-05-02 15:40:15 +05:30
Hongtu Zang f1c794de1b CLOUDSTACK-2160: fix bug add a huge size guest network will cause out of memory 
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
 2013-05-02 13:19:12 +08:00
Alena Prokharchyk 2e8e2f98f5 InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa 2013-05-01 14:06:01 -07:00
Alena Prokharchyk 7b24a7640c Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-29 16:12:10 -07:00
Jessica Wang 1f0863f75b CLOUDSTACK-2120: mixed zone management - API: extend listNetworks API to to take in zonetype. 2013-04-26 15:23:30 -07:00
Jayapal d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-25 15:16:26 +05:30
Alena Prokharchyk 7680e1cc10 Internallb: 
1) InternalLb and PublicLb can't be enabled on the same network offering
2) Can have internalLb only on VPC tier
 2013-04-24 17:24:06 -07:00
Pranav Saxena ff7112a074 Correcting the spelling errors in the Non contigous Vlan range code 2013-04-24 19:58:10 +05:30
Alena Prokharchyk ca2fc30655 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-23 16:58:28 -07:00
Mice Xia 5118e9e29f 1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128 
2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent
 2013-04-22 19:38:32 +08:00
Saksham Srivastava ea893eaf33 CLOUDSTACK-1786: While reserving IPs in guest network, if guestvmcidr is a subset of network cidr but not a subset of cidr, exception is thrown. 
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
 2013-04-19 14:08:37 +05:30
Isaac Chiang 34899f9b99 CLOUDSTACK-2077:The updatePhysicalNetwork command fails to update the database 2013-04-18 21:19:00 +05:30
Alena Prokharchyk 0cfe96bd00 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/network/IpAddress.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-17 15:51:05 -07:00
Bharat Kumar 8b40e393b8 Cloudstack-701 Support for non contiguous vlan ranges. 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-04-17 10:14:42 +05:30
Alena Prokharchyk 014689e45e Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/network/Network.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 2013-04-16 09:55:45 -07:00
Murali Reddy bc3e184b72 CLOUDSTACK-312: enable L4-L7 network services in the shared network in 
the advanced zone

Squashed commit of the following:

commit 3021cb917b2446f6a04f6cbb01bc56ebc5484bff
Merge: 77c6991 886fe01
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Sun Apr 14 17:22:05 2013 +0530

    Merge branch 'master' into sharednetworkservices

commit 77c69918be
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 9 17:16:57 2013 +0530

    Trying to fit both isolated and shared network life cycle with single state
    machine may need addtional work. So set network state for shared network explicitly now.

commit 365ed73a0c
Author: Murali Reddy <murali.reddy@citrix.com>
Date:   Tue Apr 2 17:14:11 2013 +0530

    - associateIpAddress API to associate a public IP with shared network
    - shared network with services to go through the implement and shutwdon
      phases
 2013-04-14 17:50:15 +05:30
Alena Prokharchyk 3b41d5bee1 Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-04-12 15:32:40 -07:00
Alena Prokharchyk c113ea184b Add Internal Lb Provider/Element as a part of adding a physical network 2013-04-12 12:21:24 -07:00
Likitha Shetty 8f865c5a90 Dedicate Public IP address range to an account 2013-04-12 23:27:35 +05:30
Alena Prokharchyk 915e39fbaa Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl 2013-04-11 10:19:18 -07:00
Alena Prokharchyk 7b9af28094 InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs: 
1) configureInternalLoadBalancerElement
2) createInternalLoadBalancerElement
3) listInternalLoadBalancerElements
 2013-04-10 16:29:26 -07:00
Alena Prokharchyk 039e303d4a InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins. 2013-04-10 16:29:18 -07:00
Alena Prokharchyk f0018b4512 Internal LB: 
1)Added InternalLoadBalancerManager and corresponding Impl
2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well
 2013-04-10 16:29:05 -07:00
Jessica Wang 98bc240d2a Revert "Dedicate Public IP range" 
This reverts commit d6ed8d7cb5.

Conflicts:

	server/test/com/cloud/configuration/ConfigurationManagerTest.java
 2013-04-08 17:15:51 -07:00
Likitha Shetty d6ed8d7cb5 Dedicate Public IP range 2013-04-08 14:46:21 -07:00
Jayapal Reddy 8dd0b7747b Mulitiple ip address per nic support for advacned shared networks 
Description:
Changes added for supporting multiple ip address per nic for shared networks

Testing Done:
Tested adding and removing the ip for nic using the APIs
 2013-04-01 16:24:48 +05:30
Alena Prokharchyk cf72aa3274 Fixes/improvements for VPC feature: 
1) Added comments to VPC/VPCService/VPCManager interfaces
2) Moved VPC offering related methods from VpcService to the new interface - VpcProvisioningService
3) Fixed static nat creation in the VPC - used to result in NPE due to invalid method referencing while obtaining VPC VR information
 2013-03-29 16:56:01 -07:00
Kelven Yang 8bb0990144 CLOUDSTACK-1795: implement custom AOP to fully support legacy CloudStack AOP semantcis (rebase fixups) 2013-03-29 11:12:36 -07:00
Funs Kessen 99ea4011b1 Removing baremetal related references 
Signed-off-by: Prasanna Santhanam <tsp@apache.org>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-03-27 15:56:13 +05:30
Wei Zhou 86a2a75046 CLOUDSTACK-1668: Fix IP conflict in VPC tier 
Currently, allPossibleIps return the Ip lists which include the gateway,
so we need to remove gateway ip from this list.

Now, for non-VPC network it works, because NetUtils.getAllIpsFromCidr
return the Ip lists which do not include the first IP of the network
(like 192.168.0.1).
We need too add the first IP into the returned Ip list, because it can
be used for VM if it is not the gateway IP (for example, VPC networks).

The corresponding patch for 4.0.1 has been posted on
https://reviews.apache.org/r/9923/

Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2013-03-20 00:31:52 +00:00
Jayapal Uradi b4bab5a152 CLOUDSTACK-1595 removeIpFromNic using uuid and response changes 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-03-13 14:46:31 +05:30
Jayapal Uradi a49261c3b1 CLOUDSTACK-24: mipn feature for basiczone 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-03-13 10:24:22 +05:30
Kelven Yang 3f2b771e07 CLOUDSTACK-1173: fix the regression caused by life-cycle management changes 2013-03-05 19:03:30 -05:00
Kelven Yang 333dd810d2 CLOUDSTACK-1339: Using Sping interface injection pattern to avoid using CGLIB proxying mode. Spring with CGLIB proxying will concflict with CGLIB usage in CloudStack DB code, CloudStack CGLIB usage can cause Spring to lose tack of its proxied object and therefore creates a massive amount of objects in memory 2013-03-05 19:03:30 -05:00
Jayapal Uradi aedb8c478e CLOUDSTACK-24: mipn feature for isolated and vpc networks 
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Multiple+IP+address+per+NIC
 https://issues.apache.org/jira/browse/CLOUDSTACK-24
 2013-03-04 11:02:09 +05:30
Abhinandan Prateek 14791a9d8f Revert "CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes." 
This reverts commit f9d96c9169.
 2013-03-01 22:29:47 +05:30
Jayapal Uradi f9d96c9169 CLOUDSTACK-24: multiple ip address per vm nic changes for isolated and vpc networks changes. 2013-03-01 16:40:26 +05:30
Sheng Yang 50f995f8b4 CLOUDSTACK-1170: Use a unified way to generate PublicIp 
Tired of manually generate mac address everytime when create PublicIp object.
 2013-02-27 14:20:26 -08:00
Saksham Srivastava ea3db2f073 CLOUDSTACK-705 IP Address reservation for Isolated Guest Networks 
CloudStack uses Guest CIDR for dhcp-range for the Guest VMs. The entire
CIDR is used by CloudStack for assigning IPs to Guest VMs. IP Address
Reservation will allow part of address space to be used fornon CloudStack
hosts/physical servers also, by restricting the address space of CloudStack
Guest VMs. Reservation can be configured using update Network API by specifying
guestvmCidr as an additional parameter. Reservation will be applicable for
Isolated Guest Networks including VPC. reservediprange in the response
will return the IP range that can be used for non Cloudstack hosts.

Tested manually the following scenarios:
Applying reservation when there are running VMs inside the
guest_vm_cidr.
Applying reservation when there are running VMs outside the
guest_vm_cidr.(not allowed)
Applying reservation when external device like Netscaler is configured
in the guest_cidr.
Applying reservation in VPC tiers.
Applying reservation outside the range of guest_cidr.(not allowed)
 2013-02-22 15:50:33 +05:30
frank 55b77c7c8f CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

adding missing scripts back

Conflicts:

	client/pom.xml
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
 2013-02-21 15:46:11 -08:00
Likitha Shetty 3c764c0be7 CLOUDSTACK-1207. UpdateNetwork API fails with NPE if the network offering is not being updated and is non-persistent. 2013-02-15 17:18:43 +05:30
Sheng Yang 2776ad14c8 CLOUDSTACK-1242: Fix inline mode 
Network refactor dropped many inline mode codes. I've added at least part of
them back. Now I can create LB rule for inline mode.
 2013-02-12 20:27:26 -08:00
Sheng Yang 0c5c08b78b IPv6: CLOUDSTACK-1107: Add support for createVlanIpRange to extend existed network 2013-02-08 14:48:08 -08:00
Sheng Yang 2e236a8322 IPv6: Fix ip address in range check 2013-02-05 14:31:06 -08:00
Hugo Trippaers f8a22d7520 Fix the situation where only a gateway and a netmask is passed with the 
createNetwork command.
 2013-02-04 15:08:53 +01:00
Kelven Yang 296c20332d Merge javelin into master 2013-02-01 14:40:45 -08:00