4dddd76e95
CS-15534: Mark VPN connection as Disconnected when rebootRouter
2012-07-23 21:07:49 -07:00
6e571d28df
S2S VPN: Add check for router status before apply vpn
2012-07-23 19:53:06 -07:00
22826032b4
VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones
2012-07-23 16:18:49 -07:00
cec0ea54ec
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:32:56 -07:00
49199d0022
VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to
2012-07-20 16:28:43 -07:00
2a97fdae64
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-20 15:39:43 -07:00
c581d8b820
CS-15586: Public Vlan for an account fails in case of multiple Physical networks
...
Changes:
- Since Now a zone can have multiple physical networks, we need to find the physical network Id from the networkOffering's tag and zoneId and trafficType when we create a guest network
2012-07-20 15:39:26 -07:00
04ed3884d0
CS-15622: always get router info from the DB
2012-07-20 14:35:39 -07:00
aa6ee7c506
VPC: one more fix for multiple public nic case for the VPC VR
2012-07-20 14:08:00 -07:00
c0fb2fece9
VPC: CS-15638: Plug nic for the public ip address if the ip address from the diff vlan range than sourceNat ip
2012-07-20 13:25:09 -07:00
f243765758
304-305 DB upgrade: upgrade for VPC and resourceTags feature
2012-07-19 16:54:00 -07:00
6224423ecc
More logging to the VirtualRouter manager
2012-07-19 14:02:04 -07:00
ff8acfa50a
CS-15404 [2.2.14 to 3.0.4 upgrade] After upgrade cloud.physical_network.id starts from 200 which is not the case with fresh installation
...
Reviewed-By: Alena
Changes:
- We need to set the id while creating physical network entry.
2012-07-18 16:49:05 -07:00
a8fd70fe0a
Bug 14773 - VM's are unable to start after upgrade from 2.2.14 to 3.0.3
...
Reviewed-By: Alena P.
Changes:
- Added upgrade path to 304. This would check the missing portions of the previous upgrades and try to correct.
- This will check if the setup has multiple physical networks with Guest traffic type. If yes then:
- Check if the previous upgrade has left behind any guest networks that were untagged in 2.2.14. For such networks, add a new physical network
- Check if the multiple physical network has tags. If no add tag and clone the network offerings for the networks on this physical network and add this tag to them
- Also clone the network offering service map.
- Thus this creates copies of offerings for each physical network.
2012-07-18 16:32:23 -07:00
9bebe245ca
More logging on nic release
2012-07-18 10:59:07 -07:00
3dca5a8689
CS-15615: Fix Site2SiteVpnService injection
2012-07-18 09:58:14 -07:00
d2643c0fdf
CS-15574: Delete VPN gateway and connection when deleting VPC
2012-07-17 18:06:15 -07:00
14c3ef17ad
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:47:02 -07:00
c36de737db
S2S VPN: Use source NAT ip address for VPN gateway
2012-07-17 17:22:00 -07:00
d7214db5ae
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 13:40:28 -07:00
0575b83ec0
VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB
2012-07-16 11:26:16 -07:00
2557315a5a
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr broadcast ip
2012-07-13 18:20:30 -07:00
b145029718
VPC: CS-15580 - don't allow gateway for VPC guest network to be equal to the cidr subnet
2012-07-13 17:06:10 -07:00
695db226af
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-13 13:44:33 -07:00
b14cebbe68
CS-15556: [NS Autoscale] System VMs not coming up in Basic zone EIP ELB offering
...
Description:
Removing a reference to user_vm table when populating a system VM
id in an exception. Undoing change committed earlier as part of
Bug CS-15217.
2012-07-13 13:44:10 -07:00
f9552f4707
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:06:36 -07:00
34066935c0
VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
2012-07-13 12:48:51 -07:00
ab418176ef
VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat
2012-07-13 10:37:09 -07:00
7ef5f314ee
CS-15526: Failed to create a guest network for basic zone.
...
Description:
vlanId isn't a db ID, so removing its inclusion
in an IdentityProxy object when throwing an
exception. It's a string, so it was causing
problems since it was being converted to a Long.
2012-07-12 17:36:12 -07:00
7e73ae8e74
VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network
2012-07-12 10:04:39 -07:00
988831327a
VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc
2012-07-12 09:09:09 -07:00
05c910ca5c
CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
...
Description:
Removing DB IDs from exception messages.
2012-07-11 20:57:09 -07:00
a0f6cb47f1
CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
...
Description:
Removing DB IDs from exception messages.
2012-07-11 19:52:56 -07:00
fcd9c0c368
VPC: CS-15550 - fixed listVPCs by cidr
2012-07-11 19:10:48 -07:00
c5be9daa95
CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
...
Description:
Removing more DB IDs from exception messages,
2012-07-11 18:34:00 -07:00
79bb22c942
CS-15544,fixed
2012-07-11 16:01:07 -07:00
1e407f62ad
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-11 15:52:55 -07:00
9fe68fc4a9
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-11 15:48:29 -07:00
f2c8a59983
CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
...
Description:
More changes to remove DB IDs from exception messages,
2012-07-11 15:46:17 -07:00
be4185338f
VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state
2012-07-11 15:04:34 -07:00
a0a0113b51
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-11 14:51:19 -07:00
1a3a899d59
VPC: fixed logging
2012-07-11 14:51:19 -07:00
c44af15cd6
VPC: added State to vpc_gateways
2012-07-11 11:53:30 -07:00
b8b7d06f15
VPC: don't send staticRoutes in Revoke state to the VPC VR
2012-07-11 10:51:20 -07:00
d4d1b1c5a9
Revert "Fix for CS-15345". This issue was caused due some bug in VPC related cleanup code. The bug got fixed as part of 3caffc7855, so this is no longer needed.
...
This reverts commit a8c1568b37
2012-07-11 14:19:29 +05:30
6582882666
S2S VPN: Add domain and account for VPN
...
Admin can add VPN connection for others
2012-07-10 18:55:08 -07:00
a3424cf8a0
VPC: add vm to network - no need to prepare nic when add vm in Stopped state to the network; the nic will be prepared once the vm starts up
2012-07-10 18:02:44 -07:00
954b937a42
VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend
2012-07-10 18:02:44 -07:00
4e5355b192
VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call
2012-07-10 15:15:30 -07:00
37a0ef7375
CS-15512: Fix delete vpn connection
2012-07-10 14:47:27 -07:00
3caffc7855
VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method
2012-07-10 14:33:24 -07:00
8212de6f94
CS-15513: Fix group 5 of s2s vpn
2012-07-10 10:31:25 -07:00
08b9b3bc5b
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:08:44 -07:00
e8658c9525
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 16:24:44 -07:00
9c9b7ee299
CS-15503: don't send Ips in Releasing state as a part of VPC VR start
2012-07-09 15:30:50 -07:00
1657486f41
VPC: added vpc_id to private_ip_address table to indicate which vpc the ip belongs to
2012-07-09 13:00:03 -07:00
98f8e70ca9
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 10:11:29 -07:00
29aaf4c841
VPC: fixed listNetworkACLs by networkId
2012-07-06 16:33:31 -07:00
a9e1c8fa86
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:26:33 -07:00
987cf9bc93
CS-15447: Don't enable s2s vpn when provider is disabled
2012-07-06 15:08:26 -07:00
c49cc27b1c
VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only
2012-07-06 14:54:25 -07:00
ed63a14d5e
Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value
2012-07-06 10:32:24 -07:00
447f018b13
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-05 18:06:52 -07:00
f9d512f163
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
2012-07-05 17:33:20 -07:00
7c647223f2
VPC: don't fail when create/remove static route when VPC VR is in Stopped state
2012-07-05 17:26:25 -07:00
3a557c2998
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-07-05 17:06:02 -07:00
f1ec4fddd3
CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
...
Description:
As part of the fix for Bug CS-13127, a new overloaded function,
addProxyObject() was added to facilitate transparent db id to
uuid conversions when db IDs were added to exceptions that were
thrown in the Cloudstack mgmt server code. However, it turns out
that there are quite many db IDs still in the code that are
being directly embedded in the String message that is passed
during exception creation.
In this commit, we modify the default constructor of
InvalidParameterValueException so that it takes a second
argument of type List<IdentityProxy>. This will help developers
see that there is a second parameter required, and make them
look into what that parameter is about. Hopefully, this will
stop db IDs from being embedded into the exception message.
The parameter can be set to null though, since there are many
places in the code that don't embed any DB IDs in the exception.
This is still a WIP, so the older default constructor for
InvalidParameterValueException has not been removed yet. When
all instances of throw new InvalidParameterValueException()
have been moved over to the new default constructor, the old
one will be removed, else compilation will break. The reason
for having to do this in batches is that there are way too
many places in the code that throw exceptions, and they all
cannot be covered in a single commit without it taking much
time.
In following commits, all other exceptions will be changed
in the same way as InvalidParameterValueException.
2012-07-05 16:48:36 -07:00
a0a5e25e32
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-05 15:45:21 -07:00
24023fd14d
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-05 15:20:44 -07:00
d8cdb89721
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-05 13:56:55 -07:00
2699e2c508
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-05 13:34:34 -07:00
f1ac568a91
VPC : check if dns1 is null
2012-07-05 11:53:04 -07:00
e6d73fb114
VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start
2012-07-05 10:32:51 -07:00
931c3eb78e
VPC: removed NetworkACL interface; added getTrafficType() to Firewall
2012-07-05 10:22:49 -07:00
1ac1bcb2f6
VPC: createLB rule - removed duplicated check for ip services when createLB rule
2012-07-03 17:34:49 -07:00
3a56e3c55c
VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR
2012-07-03 17:10:12 -07:00
5a175e871c
VPC: CS-15355 - fixed router when deployVm in Basic zone
2012-07-03 17:10:12 -07:00
ca5a53ce4d
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-03 15:43:35 -07:00
e71732babc
CS-14952: Nexus vSwitch: vCenter IP Address and DataCenter information is not present in the "virtual_supervisor_module" table. VSwitch Crendentials are not encrypted.
...
Description:
Qualifying the VSM password stored in virtual_supervisor_module
as encryptable. The encryption/decryption is transparently done
by the cloudstack DAO layer.
2012-07-03 15:41:42 -07:00
9f6d03b87b
VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only
2012-07-03 15:37:07 -07:00
1011dfd31c
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)
2012-07-03 14:47:07 -07:00
2742c50484
CS-15385 : fix vm start in basic zone
2012-07-03 11:30:59 -07:00
1e67de0ac5
VPC: added missing FirewallService to the VR provider
2012-07-03 09:34:45 -07:00
a8c1568b37
Fix for CS-15345
...
During account cleanup, associated network is accessed without checking whether it is present or not. Added a check to use it only when present.
2012-07-03 18:52:36 +05:30
6af13737fa
VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin)
2012-07-02 17:31:47 -07:00
e3ca32af2a
VPC: remove network ACLs from VPC VR when shutdown guest network
2012-07-02 16:44:43 -07:00
c5cdd6947f
CS-6840: Fix 0 id returned by createVpnConnection
2012-07-02 16:15:43 -07:00
481f59df3b
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 14:14:34 -07:00
4415c67604
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
2012-07-02 12:58:30 -07:00
618d2541c8
CS-6840: Add status checking for site 2 site VPN
2012-06-29 18:58:52 -07:00
0f06bc6643
VPC : network usage works in VPC
2012-06-29 17:33:17 -07:00
49d8b650e9
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
2012-06-29 15:17:17 -07:00
07ef43bc84
VPC: added vpccidr to the list of VPC router bootload args
2012-06-29 13:59:49 -07:00
37f29ccb11
VPC: set networkId to be null for IP address when the last PF/LB rule is removed for it and the IP belongs to VPC
2012-06-29 13:46:20 -07:00
077ca1489c
bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager
2012-06-28 18:07:47 -07:00
e6383fc845
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:13:39 -07:00
66a918f51a
CS-6840: List all objects without require parameter
2012-06-28 15:25:15 -07:00
ceb4445166
VPC: createPF/createLBrule: 1) don't allow to pass openFirewall=true 2) when no openFirewall is passed in, defaulted to false if the public ip belongs to VPC
2012-06-28 14:19:14 -07:00
90b96642a7
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 13:14:54 -07:00
23c96451a7
CS-6840: Add hypervisor commands for site-to-site vpn
2012-06-27 19:06:32 -07:00
8670b703d2
CS-6840: Add Site2SiteVpnServiceProvider
2012-06-27 19:05:48 -07:00
52e80e5fb0
CS-6840: Add commands for site-to-site vpn
2012-06-27 19:05:41 -07:00
67a434243b
CS-6840: Add data structure for site-to-site vpn tables
2012-06-27 19:05:33 -07:00
edb8e04b0e
VPC: update public IP info in domain_router table once the VR gets the public nic
2012-06-27 17:41:41 -07:00
74043d28e4
VPC: delete network ACLs as a part of network cleanup
2012-06-27 15:58:09 -07:00
bc9b23dfcd
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-27 15:12:56 -07:00
67f4776243
VPC: fixed ip addres assignment in createLB rule
2012-06-27 14:09:33 -07:00
a65655e559
VPC: as there is no support for FirewallRules/remoteAccessVPN in the VPC, removed the networkId from the list of parameters for corresponding api calls
2012-06-27 14:09:33 -07:00
e2fd2f7515
VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC
2012-06-27 10:31:44 -07:00
9936e9b731
VPC: 1) Don't allow to delete private gateway when it has static routes assigned. Routes have to be removed first.
...
2) Re-apply static routes as a part of VPC VR start
2012-06-26 15:14:29 -07:00
8a7e525aa9
VPC: fixed getEntityOwnerId() in AssociateIpAddress command to return vpc owner if vpcId is passed in. Added action events for create/delete privateGateway/staticRoutes
2012-06-26 14:08:13 -07:00
ccb075de6f
VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands
2012-06-26 13:36:33 -07:00
9d88781e8c
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-26 11:11:26 -07:00
a539c6e824
VPC: intermidiate checkin to Static Routes
2012-06-25 18:08:19 -07:00
84a4a7c1c8
VPC: update ip address object after the ip is associated with the network
2012-06-25 16:26:19 -07:00
32c858ecd2
VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics
2012-06-25 15:59:23 -07:00
b407b8831c
VPC: initial checkin for Static Routes
2012-06-25 15:16:17 -07:00
8cbf5f749f
VPC: Don't allow to do ip assoc to the network in the VPC. The ip should be assigned to the VPC itself
2012-06-25 13:19:28 -07:00
9971120897
VPC: moved NetworkACL manager to the vpc folder
2012-06-25 13:19:28 -07:00
c2e3833651
VPC : typo in FirewallRuleVO
2012-06-25 13:09:56 -07:00
12bfac6857
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 11:31:53 -07:00
515340b5e3
VPC: listPrivateGateways API implementation
2012-06-25 10:12:10 -07:00
05332128e9
VPC: resend private gateway as a part of VPC VR start
2012-06-22 15:47:15 -07:00
d1700606dd
VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_
2012-06-22 15:06:58 -07:00
ba7fddac3b
VPC: implemented add/delete Private gateway
2012-06-22 15:06:58 -07:00
a96a259923
VPC: apply dhcp entries only after all guest nics are plugged
2012-06-22 10:06:26 -07:00
516628273f
VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement
2012-06-21 15:10:15 -07:00
4ea750680b
Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
...
Conflicts:
api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
2012-06-21 10:05:31 -07:00
e56dbdf78e
canUseForDeploy is always false for system networks
2012-06-20 15:42:41 -07:00
0dbd487a22
VPC: implemented delete and list Network ACL(s)
2012-06-20 14:24:30 -07:00
bb30a6b6bb
VPC: initial checkin for network ACLs
2012-06-20 12:48:00 -07:00
1862942bc9
VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command)
2012-06-20 10:37:47 -07:00
b8f67f0249
Vpc: fixed the network shutdown happening as a part of GC thread for VPC networks
2012-06-19 14:30:50 -07:00
17b9952b86
VPC : use correc provider for guest network inside VPC
2012-06-19 11:30:11 -07:00
da6c58ed30
VPC: plug guest nic on guest network implement, and unplug on shutdown
2012-06-19 10:00:56 -07:00
7a23556513
Network usage for VPC implementation
2012-06-18 17:48:35 -07:00
830f12aadf
Don't need to check guest cidr overlap
...
It's not external devices, so guest network with different vlan can be the same.
2012-06-18 16:03:03 -07:00
375bb99f09
Don't send public/guest nic info when start VR in VPC
2012-06-18 15:57:58 -07:00
b9263b0c51
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-06-18 13:01:11 -07:00
2ef8287287
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd
...
Description:
Fixing two other scenarios apart from the reported one
where we were not passing in database IDs for translation
into uuids, in the exception.
2012-06-18 12:57:56 -07:00
e03ed60540
Bug 13127: API error text refer to database ids instead of uuids
...
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd
Cherry-picking from master for bug 14448 into 3.0.x. Resolved
conflicts encountered during cherry-picking.
Description:
Adding overloaded addProxyObject() function to CloudException
and RuntimeCloudException classes and using this function
to stuff exceptions with IDs, to reduce code footprint.
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
2012-06-18 12:55:44 -07:00
7860b78049
Bug 13127: API error text refer to database ids instead of uuids
...
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd
Cherry-picking from master for bug 14448 into 3.0.x. Resolving
conflicts arising from the pick.
Description:
Modifying the API functions' exception handling to call
addProxyObject() wherever applicable, and removing some
wrong calls to addProxyObject() that were put in in an
earlier commit for this bug.
With this commit, we cover many API functions to use the
new exception handling code, but some pieces may still be
left out. These will be covered as work in progress, when
making changes to the CS API code.
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
2012-06-18 12:44:18 -07:00
6d48578234
Bug 13127: API error text refer to database ids instead of uuids
...
Bug CS-14448: Wrong error message on using the createVlanIpRange cmd
Cherry-picking from master for bug 14448 into 3.0.x. Modified the
pick to resolve some conflicts.
Description:
Removed some wrong invocations to addProxyObject() when
throwing exceptions in NetworkManagerImpl.java.
Replaced db ids with uuids in various points in the code
of NetworkManagerImpl.java, where exceptions are thrown.
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-18 12:18:17 -07:00
3b2b8fc143
VPC: fix VPC cidr check
2012-06-18 11:40:59 -07:00
1abdb876c9
1) Allow having multiple shared networks with the same vlan
...
2) Added new parameter to listNetworks command - canUseForDeploy(boolean). When true, list only networks that can be used for vm deployment (networks have enough ip addresses to allocate from for the vm)
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/ListNetworksCmd.java
api/src/com/cloud/api/response/NetworkResponse.java
api/src/com/cloud/network/NetworkService.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/IPAddressDao.java
server/src/com/cloud/network/dao/IPAddressDaoImpl.java
2012-06-15 15:57:56 -07:00
5235894b20
Changed log level to trace for vpc router element
2012-06-15 12:58:15 -07:00
aaf0d24a83
Merge branch 'vpc-3.0.x' into 3.0.x
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/event/EventTypes.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
setup/db/create-schema.sql
wscript
2012-06-14 19:04:59 -07:00
127daa5831
Fixed lock problem when add vm to guest network
2012-06-13 16:43:43 -07:00
2412b7837d
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-13 14:56:04 -07:00
a5f0b64562
Added new capabilities to VPN and Firewall services defining if VPN is S2S or Remote access, and if the Firewall rules should be created per cidr or per public ip address
2012-06-13 10:17:48 -07:00
Sheng Yang
Alena Prokharchyk
prachi
anthony
Vijayendra Bhamidipati
Edison Su
Koushik Das
kishan