3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
71ead9ef4e
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -07:00
d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
39485a4a56
VPC: CS-15821 - corrected mac address format for vpc private network
2012-08-02 18:07:15 -07:00
8f797afd42
VPC: CS-15813 - ICMP type and code validation
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-01 19:55:51 -07:00
21e8fb372b
VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 19:02:43 -07:00
a4c52d41e8
VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC
2012-08-01 18:57:52 -07:00
b92d2336ad
VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
...
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
5cbe3d9722
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
...
Conflicts:
api/src/com/cloud/api/commands/ListVPCsCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
d2df3e0102
VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols
2012-08-01 18:48:21 -07:00
7cceaae912
VPC: moved vpc related code from NetworkManager to VpcManager
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.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-08-01 18:45:06 -07:00
ebe53a91d7
VPC: reduced visability for some vpc related methods
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 18:33:12 -07:00
807a9ed2c3
VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:56:25 -07:00
190329286c
VPC:
...
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:55:39 -07:00
c357134330
CS-15574: Delete VPN gateway and connection when deleting VPC
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:45:42 -07:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
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
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07: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
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
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
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
c2134b431f
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:30:58 -07:00
525ba472e8
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 18:23:58 -07:00
21519070fc
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManager.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-09 18:23:35 -07:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -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
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
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
183633cf70
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
b565f63e42
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
308fd39a73
VPC: delete network ACLs as a part of network cleanup
2012-06-28 10:18:23 -07:00
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
Alena Prokharchyk
Sheng Yang