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
a87a0619c2
S2S VPN: Add state for vpn connection response
2012-07-09 16:54:40 -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
fe958786b5
CS-15459: fixed listTags by resourceType
2012-07-09 14:58:11 -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
03138dee07
listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB
2012-07-09 10:11:29 -07:00
98f8e70ca9
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 10:11:29 -07:00
993852c5df
CS-15429: Create instance should fail if it results in exceeding volume resource limits for a user/domain-admin.
...
Additional fix needed if an instance is being created from an ISO. If an instance is created from an iso disk
offering id is not null and only one root volume disk is created. Making a fix to pass the right resource count
for an instance being created from an iso.
Reviewed-By: Rajesh
2012-07-09 17:52:32 +05:30
6a9d5a7a0d
ResourceTags: respect tag parameter in listTemplates/listIsos commands
2012-07-06 16:37:40 -07:00
29aaf4c841
VPC: fixed listNetworkACLs by networkId
2012-07-06 16:33:31 -07:00
b5cb3ef70e
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-06 15:58:55 -07:00
06a9ef7923
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-06 15:58:12 -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
009f2543ed
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-06 15:13:51 +05:30
f659958c24
CS-15430 Create snapshot should fail if creating snapshot results in exceeding snapshot resource limit for domain-admin or user accounts
...
Reviewed-by: devdeep.singh@citrix.com
Change:
1. Before creating the snapshot, we synchronized checkresourcelimit to allow the users to create the snapshot and increment the resource count.
2. Depending on the failure of snapshot creation/ backup, we are decrementing the resource count.
2012-07-06 15:08:46 +05:30
f2546dd2bd
CS-15459: fixed listTags for userVms
2012-07-05 18:33:23 -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
21cdd08948
VPC: don't allow vm to be a part of more than one VPC
2012-07-05 15:28:30 -07:00
24023fd14d
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-05 15:20:44 -07:00
a44843af69
VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not
2012-07-05 14:04:34 -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
892ee23ca5
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-05 11:32:24 +05:30
922d254b72
CS-13376- Vm is stuck in Stopping state when MS is rebooted after the stop command was issued, but answer wasn't recieved from the backend yet
2012-07-05 11:29:01 +05:30
7d6db010ac
CS-15429: Create Instance should fail if creating instance results in exceeding volume resource limit for domain-admin or user accounts
...
Reviewed-by: devdeep.singh@citrix.com
Change: Adding a check for diskOfferingId
2012-07-05 11:27:48 +05:30
c6448d0e8e
CS-13376- Vm is stuck in Stopping state when MS is rebooted after the stop command was issued, but answer wasn't recieved from the backend yet
2012-07-05 11:24:24 +05:30
a4740b314f
CS-13376: Vm is stuck in Stopping state when MS is rebooted after the stop command was issued, but answer wasn't recieved from the backend yet..removing trailing whitespaces in the code
2012-07-04 22:04:20 +05:30
75026053bc
CS-13376: Vm is stuck in Stopping state when MS is rebooted after the stop command was issued, but answer wasn't recieved from the backend yet
2012-07-04 21:51:32 +05:30
1ac1bcb2f6
VPC: createLB rule - removed duplicated check for ip services when createLB rule
2012-07-03 17:34:49 -07:00
3383c79452
VPC: added zoneName to the VPC api response
2012-07-03 17:14:07 -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
a899391b6e
VPC: fixed response tag for VpcRespnse
2012-07-03 16:12:37 -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
f5f356c150
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-07-03 14:01:07 -07:00
9e3330374f
CS-15151: Cluster_details table stores Vcenter Cluster credentials in clear text
...
Description:
Encrypting password values before they're written out to
the cluster_details db, and decrypting them when reading
in the values from the db.
2012-07-03 13:47:29 -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
b071260878
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:08:09 -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
1791c7533b
cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object).
2012-07-02 13:39:34 -07:00
4415c67604
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
2012-07-02 12:58:30 -07:00
60da16fe8b
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-02 10:24:10 -07:00
b09e43f977
CS-15300 Limits on domain admin accounts
...
Reviewed-by: devdeep.singh@citrix.com
change: fix for listResourceLimits
2012-07-02 20:13:06 +05:30
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
e07ec3cd2c
cloudstack 3.0: (1) API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
...
(2) UI - Add site-to-site VPN dialog - call CreateVpnConnection API after CreateVpnCustomerGateway API returns success.
2012-06-29 14:55:26 -07:00
6cf45ad29b
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-06-29 14:40:00 -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
3f61f42a7e
Fix for CS-15300 Limits on domain admin accounts
2012-06-29 23:53:32 +05:30
d922b99c64
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-06-29 11:05:10 -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
7a5d3f365d
Fixed unittest
2012-06-28 17:21:42 -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
c4cf065a3f
bug CS-15221: Encrypt config value before changing category to Hidden. Regression due to af1fc1cf5d361cb6d43e0107a644c42f645a0ccc
...
status CS-15221: resolved fixed
reviewed-by: Nitin
2012-06-28 15:54:45 -07:00
fc44c5203e
bug CS-15168: Use cagetory from DB instead of Config.java, set category to Hidden during upgrade if they are not already
...
status CS-15168: resolved fixed
reviewed-by: Nitin
2012-06-28 15:49:53 -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
709e878e43
CS-15356: cloudstack 3.0 API - updateZone API - when internaldns2 parameter is not being passed to updateZone API, leave it as is (i.e. remain original value of internaldns2).
2012-06-27 16:43:55 -07:00
74043d28e4
VPC: delete network ACLs as a part of network cleanup
2012-06-27 15:58:09 -07:00
4c187a66d1
Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x
2012-06-27 15:37:50 -07:00
73a3c8f496
Bug CS-15372: IdentityProxy info should be copied over during exception handling in API layer for create(), like it is done in execute().
...
Description:
1. Added exception processing for uuid lists in exceptions,
for commands of type BaseAsyncCreateCmd.
2. Added nullpointer check in addProxyObject().
3. Miscellaneous whitespace reformatting for git patching.
2012-06-27 15:33:19 -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
0b620bc852
VPC: fixed list public ips by vpcId
2012-06-26 16:35:56 -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
2f678f5697
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:01 -07:00
0f863b3025
Fixed unittest
2012-06-25 20:38:16 -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
f56795d22b
Fix bug CS-15261.
...
In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing.
2012-06-25 15:21:20 +05:30
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
f013c28536
Fixed unittest
2012-06-21 15:43:02 -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
77b2b4a372
CS-15256: Unable to associate cluster with Nexus VSM upon a retry if addCluster command fails the first time
...
Description:
Putting in code to clean up stale VSM records in case
addCluster fails to communicate with the vCenter server.
2012-06-18 15:03:59 -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
8e47091ccd
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.
Description:
Replacing placement of db ids in exception messages to uuids
in the file ManagementServerImpl.java.
Since there are a large number of files that throw exceptions
with db ids in them and they need to be changed, we will make
the changes in multiple commits.
2012-06-18 11:47:58 -07:00
3b2b8fc143
VPC: fix VPC cidr check
2012-06-18 11:40:59 -07:00
79abb862f3
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.
Description:
Adding a new class AnnotationHelper, that provides routines
to read annotations from a VO class.
Cloudstack does the mapping between cloudstack java VO objects
and the database tables using cglib. cglib creates proxy objects
as the maps between VO objects and the database. A VO (value
object) class is populated after querying from the MYSQL database.
Ideally, a getAnnotation() issued on a cglib proxy object should
get a list of all the annotations in all classes in the inheritence
chain. However, this functionality seems to be currently broken
in cglib. Hence, when querying for annotations given the object
of a VO class, we need to get to the corresponding VO class of that
cglib proxy class and issue a getAnnotation() on that class. To get
the VO class, we simply need to get the super class of the proxy
object. Also, we need to recurse to the root VO class in case the
VO class extends another VO class.
Note that the cache used by CS is ehcache.
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-06-18 11:39:36 -07:00
f5f07ca0fd
CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.
...
Reviewed-by: Alena Prokharchyk
2012-06-18 10:17:51 -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
5c5a2adb90
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-14 15:17:11 -07:00
127daa5831
Fixed lock problem when add vm to guest network
2012-06-13 16:43:43 -07:00
Koushik Das
Sheng Yang
Alena Prokharchyk
Devdeep Singh
Vijayendra Bhamidipati
Deepti Dohare
anthony
Pranav Saxena
Jason Bausewein
Jessica Wang
kishan
saksham