etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,284 Commits 324 Branches 325 Tags 861 MiB
Commit Graph

5924 Commits

Author SHA1 Message Date
Alena Prokharchyk 11fe086ada Fixing CLOUDSTACK-226: don't allow physical networks with overlaping vnet ranges, belong to the same zone. Fixed create and update physical network code 2012-09-28 13:11:20 -07:00
Alena Prokharchyk dc64fcab93 Removed unused code that was commented out in SnapshotManagerImpl- you can alway retrieve it back from the history if needed 
Conflicts:

	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2012-09-27 11:13:37 -07:00
Alena Prokharchyk efab2f413b Removed more unused imports in Snapshots code 
Conflicts:

	server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
	server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
 2012-09-27 11:12:53 -07:00
Alena Prokharchyk c27b44e7f7 Removed unused imports from snapshot manager 2012-09-27 10:50:48 -07:00
Alena Prokharchyk 6875f48966 Validate port ranges in PF rule only when startPort != endPort in private or public range 2012-09-27 10:50:30 -07:00
Alena Prokharchyk bbbccc0a7b Port ranges for PF rules: public port start should be equal to ending port start; the same applies to end ports 2012-09-27 10:50:04 -07:00
Kishan Kavala 4fcf64dd74 updated regions branch with changes from master 2012-09-27 17:04:59 +05:30
Kishan Kavala 39d394a8e8 Propogate Domain and User commands 2012-09-27 16:44:12 +05:30
Mice Xia daeac9ec57 CLOUDSTACK-215 CPVM load balance didn't work, VNC console sessions go to one CPVM and ignore other CPVMs 2012-09-27 13:03:09 +08:00
Marcus Sorensen 3c25d0ea67 CLOUDSTACK-202 Can't create VM from ISO, when in VPC 
Signed-off-by: Mice Xia <mice_xia@tcloudcomputing.com>
 2012-09-27 10:07:15 +08:00
Kishan Kavala 6540ff8fa1 bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state 2012-09-26 13:54:49 +05:30
Mice Xia 2da5b448a1 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start (add exception handling) 2012-09-26 14:51:17 +08:00
Mice Xia 7e75140537 CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start 2012-09-26 14:05:37 +08:00
Alena Prokharchyk 51041e4f77 Fixed security problem in listAccounts call (regular user could see other accounts' info when domainId was passed in to listAccounts call) 2012-09-25 10:44:22 -07:00
Sheng Yang a82ee7715e CLOUDSTACK-191: Update checking for updateCustomerGateway 
Reviewed-by: Anthony Xu

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-09-24 17:47:09 -07:00
Edison Su a01304e65b CLOUDSTACK-123: fix NPE 2012-09-18 16:43:05 -07:00
Mice Xia 955cbd97bc CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state 2012-09-18 11:18:44 +08:00
Mice Xia 16c1fd9288 CLOUDSTACK-116 Guest Network created in a Sub Domain which doesn't have a network domain suffix, is assigned the network domain suffix of the zone instead of that of the Parent domain of the Sub domain 2012-09-17 21:23:41 +08:00
Murali Reddy ff81fda4e0 adding missing import that should have been part of commit b28749f2b1 2012-09-17 13:18:32 +05:30
Murali Reddy b28749f2b1 upgrade external devices support from 2.2.14 to network offering framework 2012-09-17 11:39:41 +05:30
Manikanta Kattamuri cfc2b85651 Removing eclipse .classpath and .project files as they are configured to ant build and adding the entries into .gitignore to stop further comitting of the files 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-09-13 14:18:14 -04:00
Koushik Das a9559cbb67 When a VM is force deleted and the host is not available then CS simply marks the state in db as "Destroyed/Expunging". The VM is still running on the host and once it becomes available again there is a discrepancy in state of the VM. In this scenario the VM is removed from the host when the next full cluster sync happens. 2012-09-13 16:34:53 +05:30
Mice Xia 5532f58bbc remove cloud.com license headers 2012-09-13 12:34:32 +08:00
Mice Xia 55bcfaf805 CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI 2012-09-13 11:21:11 +08:00
Sheng Yang fe8a2992a2 Elimiate mystery guestIp in IpAddressTO 
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
 2012-09-12 15:42:48 -07:00
Saksham Srivastava a56631bc66 bug CS-15278: Added global setting login.attempts.allowed which defines the maximum incorrect password attempts allowed. 
Also after the maximum attempts are reached the user account is disabled
 2012-09-12 19:35:24 +05:30
Prasanna Santhanam cd77e42a71 Closing open transactions from SecurityGroupWorkDao 
reviewed-by : Prachi Damle
 2012-09-12 18:48:33 +05:30
Alena Prokharchyk c876a66b3f Fixed unittest 2012-09-11 17:26:20 -07:00
Alena Prokharchyk f5c9397327 CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup) 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-09-11 17:05:04 -07:00
Alena Prokharchyk d0c526fdcd Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code) 2012-09-11 17:03:11 -07:00
Fang Wang 6fd7da8f56 Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton. 2012-09-11 17:03:11 -07:00
Likitha Shetty cc80d09d77 CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded. 2012-09-11 16:58:09 -07:00
Alena Prokharchyk acd08e61e6 CS-16239: don't try to pull key information if the key was removed in the system 
As a part of the commit, also checking deleteSshKeyPair name - admin was unable to delete the key on behalf of another user

Conflicts:

	server/src/com/cloud/api/ApiDBUtils.java
 2012-09-11 14:37:25 -07:00
Koushik Das 65eeeaf071 CS-14277 
Support for local data disk. Currently enable/disable config is at zone level, in subsequent checkins it can be made more granular.
    Following changes are made:
    - Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
    - Create/delete of data volume on local storage
    - Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
    - Migration of VM instance is not supported if it uses local root or data volumes.
    - Migrate is not supported for local volumes.
    - Zone level config to enable/disable local storage usage for service and disk offerings.
    - Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
    - Deploy VM command validates service and disk offerings based on local storage config.
    - Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.
(cherry picked from commit 62710aed37606168012a0ed255a876c8e7954010)
 2012-09-11 17:22:43 +05:30
Fang Wang 4b8fb79ef6 Fix the output of instance-id and vm-id to UUID 2012-09-10 18:02:34 -07:00
Fang Wang 663e250334 Replace db-id by UUID for user VM's vm-id. 2012-09-10 18:01:08 -07:00
Alena Prokharchyk d6b6529951 Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails" 
This reverts commit ecd1ac214c.
 2012-09-10 16:34:21 -07:00
Anthony Xu 0442917381 only check ISO which is downloaded status 2012-09-10 13:30:25 -07:00
Rohit Yadav ecd1ac214c CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails 
If cleanup=true, removes all VRs and creates VR, implements network.
If cleanup=false, skips running VRs, implements network for stopped/deleted VRs.

Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
 2012-09-10 14:13:24 +05:30
Edison Su 24fa14845b Add KVM to hypervisor types allowed in VPC 
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
 2012-09-07 15:39:23 -07:00
Prachi Damle 60f130c509 CS-16258: Load Test - 1 host stuck in "Rebalancing" state forever. "java.lang.NullPointerException" seen in "Cluster-Worker" thread that was handling this process. 
- Using temp to not affect the return value for the method.
 2012-09-06 16:31:00 -07:00
Prachi Damle 61a19eb089 CS-16022: If host connection fails due to some DB error, host disconnect does not happen and mgmt_server_id is not removed. 
Making sure host disconnect is called.
 2012-09-06 16:30:50 -07:00
Sheng Yang 86427559cb CS-16269: Fix savePassword on one stopped RvR 2012-09-05 13:46:44 -07:00
Alena Prokharchyk 51cc301fef CS-16222: send password reset command only to the element responsible for the userdata service in network 
Reviewed-by: Sheng Yang
 2012-09-04 13:41:10 -07:00
Jessica Wang f509efe2d8 cloudstack 3.0 - API response serializer - change XML serialized string's encoding from ISO-8859-1 to UTF-8 to support more characters - fix "L10N: DE, ES, FR, JA, KO, SC: Garbage characters appear when using localized characters in Subscriptions page" (Reviewed-by: Brian) 2012-09-04 11:43:29 -07:00
Mice Xia dd07d1598f Fix Bug CloudStack-9 can not change OS preference from OS to none 2012-09-04 20:51:03 +08:00
Prachi Damle 083cef37f1 CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 
Reviewed-By: Alena

Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
 2012-08-31 13:40:18 -07:00
Prachi Damle 3d0069bb56 CS-16158 : Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 
Changes:

There is an unnecessary search over capacity table that scans entire table.
 2012-08-31 13:40:17 -07:00
Gavin Lee 39a676c496 Correct license header mainly for patches folder 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
I've assumed that Gavin's commit is appropriate, based
on an assumption that we will keep these files in the source
tree.  If https://issues.apache.org/jira/browse/LEGAL-146
results in a different opionion from the members, then we
will end up having to do something more drastic anyway.
 2012-08-31 10:50:46 -04:00
Gavin Lee d3921139ed Patch from Gavin Lee: Change license to ASL2.0 in server and tools 
Signed-off-by: Chip Childers <chip.childers@gmail.com>
 2012-08-30 10:36:29 -04:00
Darren Shepherd f7acd8fed8 Create random version for StartupCommands in dev env setup 2012-08-30 08:47:02 +02:00
Nitin Mehta 79ebffe4f3 CS-13594: Download template is unable to handle multiple SSVMs per zone 
Reviewed-by: Kishan
 2012-08-29 15:25:00 +05:30
Jayapal eb4a3cf6c8 bug CS-15398: fix for basic zone dns issue in multiple pods 2012-08-29 14:33:27 +05:30
olivier lamy f6f1be62b9 configuring tomcat maven plugin too 2012-08-28 23:58:06 +02:00
olivier lamy f218003607 Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack 2012-08-28 23:30:57 +02:00
Likitha Shetty 8c3450b503 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information. Component: AWSAPI. 2012-08-28 13:52:42 -07:00
Darren Shepherd ff7c964a66 Add ability to do jetty:run in eclipse 2012-08-28 09:16:44 -07:00
Darren Shepherd 43e4de429e Fix up some dependencies 2012-08-28 09:03:25 -07:00
Abhinandan Prateek 5e0ede8bd9 bug 13946: reducing poll interval 2012-08-28 12:22:46 +05:30
Alena Prokharchyk 38e26f8dbd IpAssoc: when set ROUTER_GUEST_IP, get network id from associatedNetworkId field of the ip address instead of networkId as networkId is the id of the public network the ip belongs to 
Reviewed-by: Sheng Yang
 2012-08-27 16:26:32 -07:00
Sheng Yang 82cb1095dc CS-16188: S2S VPN: Limit VPN customer gateway name duplicate checking within account 
Reviewed-by: Anthony Xu

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-27 16:11:36 -07:00
Alena Prokharchyk fbdc7fc59f CS-16178 - when remove PF rule, in VPC setup make sure if the rule is the last one for the network, disassociate it from the network 
Reviewed-by: Sheng Yang
 2012-08-27 13:46:36 -07:00
Alena Prokharchyk 48806fcc54 VPC: CS-16179 - only offerings in Enabled state can be used for VPC creation 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-27 11:11:55 -07:00
Kelven Yang 3609e44b58 commit for https://reviews.apache.org/r/6608/ 2012-08-27 10:39:49 -07:00
Alena Prokharchyk 93ac01db0b Fixed unittest 2012-08-27 09:46:56 -07:00
olivier lamy a06ed5728c remove intermediate parent poms 2012-08-27 16:43:24 +02:00
olivier lamy 3aa469da2a groupdId is now org.apache.cloudstack 2012-08-25 09:20:21 +02:00
olivier lamy 0d9b81aac6 that was an unused import not a missing dependency 2012-08-25 00:44:14 +02:00
olivier lamy e7b4e15b42 add missing dependency 2012-08-25 00:37:25 +02:00
olivier lamy 5ef60aceb1 %s/tab/ws/ 2012-08-25 00:03:23 +02:00
Darren Shepherd 4a4007e652 Add license 2012-08-24 11:18:54 -07:00
Darren Shepherd ebc0fa458a * Maven 3 support 
* Pretty Format POM's
* AWS API compiles now
 2012-08-24 11:18:54 -07:00
Darren Shepherd 490e87a617 Fix small compilation issue encountered when building with maven 2012-08-24 11:18:53 -07:00
Darren Shepherd f826971fea Maven config, initial commit 2012-08-24 11:18:52 -07:00
Hugo Trippaers e3f2cf908a Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor 2012-08-24 15:57:18 +02:00
kishan 4ea36b82e9 propogate account changes to other Regions 2012-08-24 15:59:59 +05:30
Prachi Damle a08ae8e42c [ASFCS40]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

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2012-08-23 18:18:12 -07:00
Prachi Damle aec6b4af48 [ASFCS40]Upgrade to 4.0: host_details unique key addition needs IGNORE keyword to correct the duplicates 2012-08-23 17:52:04 -07:00
Abhinandan Prateek 3298a481a8 For assignVM, marking older snapshots removed in db 2012-08-23 12:22:02 +05:30
Abhinandan Prateek 6f26894eaf Fix for a corner case during fullsync where it tolerates a VM to exist on two clusters by virtue of it’s current host id and last host id (being on two diff clusters). 2012-08-23 12:13:53 +05:30
Alena Prokharchyk 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
Alena Prokharchyk 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
Jayapal a5248f1cfc Fix for dns issue in multiple pods 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-22 16:48:41 +05:30
kishan b42a813ff1 bug CS-16112: During unplug nic iptables rules are cleaned up in both cloud_nic.sh and vpc_netusage.sh. Consolidated this code in cloud_nic.sh 
status CS-16112: resolved fixed

Conflicts:
	patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
 2012-08-22 12:00:02 +05:30
Prachi Damle 0b31a0af62 [ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0 2012-08-21 16:27:57 -07:00
Prachi Damle 4bffd71d71 [ASFCS40]Db upgrade: merging changes from 303->304 upgrade to 3.0.2 -> 4.0 on master branch. 2012-08-21 16:27:54 -07:00
Alena Prokharchyk cd0004bb86 CS-16111 - DB upgrade; fixed foreign keys names 2012-08-21 15:38:17 -07:00
Alena Prokharchyk e252de4999 PublicIpAddress api response: new parameter "associatednetworkname" - the name of the guest network associated with the ip address 
Reviewed-by: Frank Zhang

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-21 15:35:40 -07:00
Alena Prokharchyk 2bf5c99bc6 CS-15304: VR deployment - release the lock for the network once the router entry is allocated (2.2.x behavior) as opposed to releasing it when the router start is completed 
Reviewed-by: Frank Zhang

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-08-21 15:31:07 -07:00
Alena Prokharchyk 7d0ad98c93 More logging to lock operations on the network 2012-08-21 15:25:17 -07:00
Alena Prokharchyk 14dd3f07d7 Fixed line endings in VirtualNetworkApplianceManagerImpl 2012-08-21 15:24:44 -07:00
Nitin Mehta 7aa7d6e39f CS-16089: Create Template after upgrade from snapshot taken in 2.2.14 was failing since the swift_id was not null but 0 instead. Put a check in the code to check for not null and not 0 swift_id to go and download the snapshot from the swift. 
Reviewed-by: Kishan
 2012-08-21 13:46:18 +05:30
Edison Su 481aae1ebc add recreate.systemvm.enabled parameter to control recreating systemvm 2012-08-20 11:19:26 -07:00
David Nalley ac9dee94ac fix from Pradeep Soundararajan for removing build dependency on mysql-connector-java https://reviews.apache.org/r/6180 2012-08-20 13:38:19 -04:00
Sheng Yang 86d49e7aa0 CS-16060: Firewall service should be excluded from conserve mode checking 2012-08-17 17:05:04 -07:00
Sheng Yang a8efbcda58 S2S VPN: Fix license headers 2012-08-17 16:52:06 -07:00
Sheng Yang 1cfcefd2fb CS-16043: Using network based router rather than account for RVR detection 2012-08-17 16:52:06 -07:00
Sheng Yang ea6f3eb6f9 CS-14253: Apply IP when firewall rule is in place 2012-08-17 16:52:06 -07:00
Sheng Yang 4cb7a100c6 Revert "bug 14484: Apply existed firewall rules when associating IP" 
This reverts commit b409615a32.

In order to fix CS-15503. Fix of bug 14484(CS-14253) would be applied later.
 2012-08-17 16:52:06 -07:00
Edison Su 9059740dc1 HA worker thread needs to have its own worker thread configuration 2012-08-17 12:59:52 -07:00
Alena Prokharchyk f8bd05a1e3 Fixed regression in GuestNetworkGuru - get networkId from the network object passed to the method call instead of retrieving it from tne NicProfile when it wasn't set yet 2012-08-17 09:43:34 -07:00
kishan 691be5c60e bug CS-15577: Added per gateway network usage for VPC and VPN usage. VPN usage uses 525 mark for outgoing traffic and 524 mark for incoming traffic 
status CS-15577: resolved fixed
 2012-08-17 17:07:13 +05:30
Jayapal 98ae204972 giving diff ip to VR 
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-17 13:49:39 +05:30
Chiradeep Vittal 48521e74e6 ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails. 
Also, ELB feature using virtual router does not work and is deprecated currently.
 2012-08-16 12:59:00 -07:00
Chiradeep Vittal ae5d22b4ab bug CS-16036 ResourceManagerTest does not test what is says it tests 
also fixes unit test failures
 2012-08-16 12:11:41 -07:00
Chiradeep Vittal 5b85edb961 bug CS-16034 getRandomIp can return -1 unexpectedly 
also fixes unit test failures
 2012-08-16 11:42:25 -07:00
Alena Prokharchyk 335730dc65 CS-15999: added nics to domain router api response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-16 10:50:09 -07:00
Alena Prokharchyk 0bf6de3eb2 CS-16030: set UUID when persist public ip address 2012-08-16 10:13:39 -07:00
Nitin Mehta 72f896044d bug CS-15278: Download Volume fails in case of Multiple Secondary Storages. Correcting it to use the same secondary storage to copy the volume and creating the soft link 
Reviewed-by: Kishan
 2012-08-16 15:53:00 +05:30
Mice Xia 7e093a949d CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously 2012-08-15 11:06:25 +08:00
Alena Prokharchyk fe3786341f Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test 2012-08-14 13:47:04 -07:00
kishan 65c90227ae bug CS-15648: For volumes created from snapshot, create usage event after successful volume 
status CS-15648: resolved fixed
reviewed-by: Nitin
 2012-08-14 11:58:07 +05:30
Anthony Xu 5060f98268 CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second 2012-08-13 17:45:38 -07:00
Kelven Yang 04bf1a33c6 apply patch https://reviews.apache.org/r/6572/ 2012-08-13 17:28:41 -07:00
Alena Prokharchyk b3760350fe VPC: CS-15805 - guest cidr should be RFC1918 complient 2012-08-13 17:17:06 -07:00
Alena Prokharchyk 7120ce0717 Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) 2012-08-13 16:50:06 -07:00
Alena Prokharchyk 62526a715a Fixed unitest 2012-08-13 16:20:09 -07:00
Alena Prokharchyk 4433c5a51a Database upgrade from 302 to 40 2012-08-13 16:20:09 -07:00
Alena Prokharchyk 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
Alena Prokharchyk e74969fdec VPC: CS-15968 - don't send ips in Releasing state to the router when the nic is already unplugged for this Vlan 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-13 11:55:34 -07:00
tomoe@midokura.jp ce12d0d70d Submit Midokura SDN controller stubs 2012-08-13 18:55:11 +05:30
Nitin Mehta a50cf618ec bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code. 2012-08-13 16:20:57 +05:30
Mice Xia 42fbf24f86 Remove @author tag from non third-party source files in server folder 2012-08-13 15:17:31 +08:00
anthony 822cf3c9ee VPC : typo in FirewallRuleVO 2012-08-12 10:55:21 -07:00
Alena Prokharchyk 32f55f3e3c Merge branch 'master' into vpc 2012-08-12 10:22:54 -07:00
Koushik Das ff773a8122 CS-15621: Using migrateVolumes method which does not perform input validation. Some input validation in the migrateVolume method prevented migration of volume in READY state. Also using volume disk offering to check if it is a local or shared one. 
Verified on XS 6.0.2

Test scenario
- Created 2 shared primary storage pools
- Created data volume using shared disk offering
- Attached it to a running VM (created in one storage pool)
- Detached it (now it is in READY state)
- Created a new VM in stopped state (using deployVirtualMachine API with startVm=false)
- Attached the data volume to this new VM
- Started new VM (migrated volume scenario got hit when the planner assigned the other shared pool)
 2012-08-12 17:05:28 +05:30
Alena Prokharchyk b61468d65c Merge branch 'master' into vpc 
Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 2012-08-11 18:27:18 -07:00
Alena Prokharchyk d93c5d0531 VPC: CS-15950 - throw networkConflictException when try to create network rule for the ip address that is already in use for another service 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-08-10 16:37:33 -07:00
Sheng Yang 327b4833ce S2S VPN: CS-15947: Add global config for S2S VPN VPN connection counts limitation 
And subnets limitation for each customer gateway

Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:24:35 -07:00
Sheng Yang 302c9048e8 S2S VPN: CS-15932: Allow user to update customer gateway when connection state is ERROR 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:20:52 -07:00
Sheng Yang 830aec3562 S2S VPN: CS-15936: Prevent user from connecting to different customer gateway with overlapped subnets 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-10 16:20:52 -07:00
Sheng Yang a4431b5740 S2S VPN: Use coma instead of semicolon for separating cidr list 2012-08-10 16:20:52 -07:00
Edison Su 263216caa5 Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage). 
RB: https://reviews.apache.org/r/6470/
Send-by: shadowsor@gmail.com
 2012-08-10 13:33:06 -07:00
Alena Prokharchyk ccac505944 Merge branch 'master' into vpc 2012-08-10 10:47:49 -07:00
Alena Prokharchyk 5c349dd5e5 Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places 2012-08-10 10:45:38 -07:00
Mice Xia a74687128e Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly 2012-08-10 16:50:47 +08:00
Mice Xia bd2a130251 fix unittest SecurityGroupManagerImpl2Test 2012-08-10 16:01:43 +08:00
Alena Prokharchyk 6cddd1e767 Removed trailing whitespaces and fixed line endings in some files 2012-08-09 23:30:33 -07:00
Alena Prokharchyk 3cf13c8b7c Fixed unittest 
Conflicts:

	server/test/com/cloud/vpc/VpcApiUnitTest.java
 2012-08-08 19:00:08 -07:00
Alena Prokharchyk c5e3493792 Merge branch 'master' into vpc 2012-08-08 18:38:35 -07:00
Alena Prokharchyk a1f361904e Reverted "Initialize user context from AccountManager" committed to master branch by mistake 
This reverts commit da26302049.
 2012-08-08 15:26:45 -07:00
Alena Prokharchyk 057d6ccbb8 Name change for vpc/Dao package (dao is lowercased now) 2012-08-08 14:51:51 -07:00
Alex Huang 457f3b3dc9 Removed all javax source code from utils package 2012-08-08 12:58:22 -07:00
Alena Prokharchyk a5f99a2ca0 VPC: set event details in the method called by API 2012-08-08 11:52:46 -07:00
Alena Prokharchyk 048c5e50cf Merge branch 'master' into vpc 
Conflicts:
	utils/test/com/cloud/utils/component/MockComponentLocator.java
 2012-08-08 11:50:39 -07:00
Alena Prokharchyk da26302049 Initialize user context from AccountManager 
Conflicts:

	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-08 11:17:01 -07:00
Mice Xia a74c6e3104 fix CS-15814 Description of global configuration 'encode.api.response' is incorrect 2012-08-08 16:29:53 +08:00
Sheng Yang 2641b5d6b8 S2S VPN: Fix multiply remote side guest networks 2012-08-07 18:39:45 -07:00
Alex Huang c1c952b42b should have used non url safe 2012-08-07 16:58:16 -07:00
Sheng Yang 5e0eb93fe6 S2S VPN: CS-15882: Only allow VPN connection between same account's gateways 2012-08-07 16:27:04 -07:00
Alex Huang a6a864a1a8 Removed Base64 file and use the apache version 2012-08-07 15:41:54 -07:00
Sheng Yang 46a12b378c CS-15243: Add service combination check at create network offering 2012-08-07 13:17:48 -07:00
Alena Prokharchyk 95449da4be Merge branch 'master' into vpc 2012-08-07 11:37:45 -07:00
Alena Prokharchyk bda1e2d08d VPC: more unittests for VpcService 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
 2012-08-07 11:37:36 -07:00
Alena Prokharchyk 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
Alena Prokharchyk a83c753354 VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules 2012-08-07 11:24:04 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Chip Childers 81ff7a09fd CS-15875 resolved via patch from Andy Gross. 2012-08-07 14:10:11 -04:00
Abhinandan Prateek 0a2b6436dd bug CS-15859: put a check on volume limit 
Author: Abhinandan Prateek <aprateek@apache.org>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-08-07 10:47:54 +05:30
Sheng Yang 6e7b4bc07b S2S VPN: CS-15642: Re-initiate the VPN connections after router reboot 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:32:18 -07:00
Sheng Yang a8cbba9e82 S2S VPN: CS-15820: Remove account information of vpn gateway and vpn connection 
The owner would be always same as VPC owner.

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
	setup/db/db/schema-304to305.sql
 2012-08-06 15:21:54 -07:00
Sheng Yang 70d704c786 S2S VPN: Allow name to be modified in updateCustomerGateway 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-08-06 15:20:33 -07:00
Sheng Yang 1b5103c501 S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime 2012-08-06 15:19:26 -07:00
Alena Prokharchyk 5a72044dc7 Merge branch 'master' into vpc 2012-08-03 14:30:54 -07:00
Alena Prokharchyk 237d91d4c9 Removed @author tags in some classes 2012-08-03 14:25:17 -07:00
Alena Prokharchyk 3496a73878 VPC: CS-15812 - fixed listVPCs by projectId 2012-08-03 14:23:56 -07:00
Alena Prokharchyk e7a1862867 VPC: CS-15827 - register only VpcVirtualNetworkApplianceMgr 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/ha/UserVmDomRInvestigator.java
 2012-08-03 14:23:45 -07:00
Alena Prokharchyk 6eba8a818a VPC: applyStaticRoutes - don't exclude static routes in Revoke state 2012-08-03 14:15:50 -07:00
Chip Childers 78764c8b6e License header updates for the server folder. 2012-08-03 09:41:27 -04:00
Nitin Mehta 3c68f1f8e8 bug CS-15200: Introducing state transition when volume is getting copied from secondary storage and it is put into Creating state 
Reviewed-by: Kishan
 2012-08-03 17:18:13 +05:30
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
 2012-08-02 18:45:37 -07:00
Alena Prokharchyk befd6dd0c6 listVirtualMachines: implemented search by templateId/isoId 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/commands/ListVMsCmd.java
 2012-08-02 18:15:13 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk 39485a4a56 VPC: CS-15821 - corrected mac address format for vpc private network 2012-08-02 18:07:15 -07:00
Edison Su 3996094e55 Fix bug: can not deploy VM on ESXi due to incorrect 
secondaryStorageResource used for SSVM

Issue:
For deploying VMware VMs, cloud service on SSVM needs to be started with
PremiumSecondaryStorageResource, a bunch of VMware related commands rely
on it.

Changes:
1)include cloud-vmware.jar in systemvm.zip
2)start cloud service in SSVM with PremiumSecondaryStorageResource

RB: https://reviews.apache.org/r/6320/
Send-by: mice_xia@tcloudcomputing.com
 2012-08-02 11:20:35 -07:00
Edison Su e116c24989 Removed obsolete file SearchCriteria2Test.java which caused ant unittest 
to fail.
cleanup.sql cleans up CLOUD and CLOUD_USAGE databases which are required
by many unit-testcases.
RB: https://reviews.apache.org/r/6283/diff/3/
Send-by: saksham.srivastava@citrix.com
 2012-08-02 10:33:06 -07:00
mice xia 895b6a3e4b CS-15780 Global configuration 'account.cleanup.interval' is used by event purge thread 
changes:
add a new global configuration event.purge.interval for event purge thread
leave account.cleanup.interval only for account cleanup thread.
 2012-08-02 21:50:44 +05:30
Alena Prokharchyk 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
Alena Prokharchyk ce9f1afa78 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 19:04:28 -07:00
Alena Prokharchyk 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
Alena Prokharchyk a4c52d41e8 VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC 2012-08-01 18:57:52 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk d2df3e0102 VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols 2012-08-01 18:48:21 -07:00
Alena Prokharchyk 48102871e9 VPC: add account/domain info to the API vpc response 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
 2012-08-01 18:48:09 -07:00
Alena Prokharchyk 1168747128 Fixed numerous bugs in listNetworks call related to filtering by projectId/listAll/domainId/etc. All the rules below are followed now: 
1) When account/domainId or projectId are passed in:

* list all account specific networks of the account/project
* list all domain level networks from the domainId + subdomains if the targeted network has allowSubdomainAccess = true

In other words, we use all the networks that can be used for vm deployment by account/domainId.

If listAll is not specified in the request, account/domainId are being defaulted to the account/domainId of the caller
listAll is ignored if the call is being done by the regular user.

2) listAll is passed in by the Root admin, we list:

* all Account specific networks in the system
* all domain specific networks in the system

3) listAll is passed by the Domain admin, we list:

* All Account specific networks belonging to domain/subdomains of the domain admin.
* All domain specific networks belonging to domain/subdomains of the domain admin
* All domain specific networks allowing subdomain access belonging to the parent domain.

4) domainId - can be passed either with or without listAll. We list:

* all account specific networks belonging to the domain
* all domain specific networks of the domain
* all domain specific networks of the subdomains if isRecursive = true is passed in

Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-08-01 18:46:36 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk 70713043cf VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone 2012-08-01 18:20:43 -07:00
Alena Prokharchyk 9be0a5525d VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only 2012-08-01 18:19:20 -07:00
Alena Prokharchyk e0c85c0d41 VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands 2012-08-01 18:19:03 -07:00
Sheng Yang 904ef73398 Build fix. 2012-08-01 16:41:38 -07:00
Sheng Yang 96ac18d8ed S2S VPN: CS-15810: Add check for customer gateway subnets / VPC CIDR overlap 2012-08-01 15:31:17 -07:00
Koushik Das 3f571684aa CS-15631 : Support for up to 16 VDIs per VM on XS 6.0 and above 
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.

Signed-off-by: Koushik Das <Koushik.Das@citrix.com>
 2012-08-01 19:39:30 +05:30
Nitin Mehta 85398bb2e0 bug CS-13935: correcting description for create.volume.from.snapshot.wait global setting 
Reviewed-by: Kishan
 2012-08-01 18:16:01 +05:30
Alena Prokharchyk 7706a9c32f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-31 13:37:28 -07:00
Edison Su 9a9c96df64 Patch fixes file names and imports wherever used, in files introduced in 
73be77a4c1
I've renamed discover to discoverer to fix the issue. My ant debug fails
with:
     [java] ERROR [utils.component.ComponentLocator] (main:) Unable to
load configuration for management-server from components.xml
     [java] com.cloud.utils.exception.CloudRuntimeException: Unable to
find class: com.cloud.hypervisor.kvm.discoverer.KvmServerDiscoverer

RB: https://reviews.apache.org/r/6239/
Send-by: rohit.yadav@citrix.com
 2012-07-31 10:38:11 -07:00
Alena Prokharchyk 721d3ef3dc Fixed listNetworks to return domain level networks when listAll is passed to the request 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-31 10:24:09 -07:00
Edison Su 73be77a4c1 add missing files 2012-07-30 16:00:45 -07:00
Sheng Yang 67941f818d S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:52:23 -07:00
Sheng Yang d90be0d9bc S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 
Conflicts:

	server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
 2012-07-30 15:34:41 -07:00
Edison Su 7a0a9231c3 Move KVM related code into plugins/hypervisor/kvm, a new jar file is 
created: cloud-kvm.jar
 2012-07-30 14:55:47 -07:00
Pranav Saxena 36fc2bd9b5 CS-15044:API changes and UI changes to provide option to view the name of the guestnetwork a virtual machine belongs 2012-07-31 02:57:46 +05:30
Alena Prokharchyk 9ec89b9240 Allow EIP/ELB network creation only in Basic zone 2012-07-30 13:39:42 -07:00
Alena Prokharchyk 372568cb9a CS-15743: disable static nat as a part of network resources cleanup 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-30 11:08:33 -07:00
Hugo Trippaers 236f63fd34 When cleaning up or setting ip associations the NiciraNvpElement should be ignored. 
Implemented a generic ConnectivyProvider interface work around the dependency from server to nicira-plugin.
 2012-07-30 15:17:35 +02:00
kishan 7026822e20 Fixed unittest build failure 2012-07-30 15:15:47 +05:30
kishan e87147de2e fixed build failure 2012-07-30 13:55:12 +05:30
Hugo Trippaers 3313cc4a86 rrq 5834: fix for broken attachVolume command 2012-07-30 08:38:50 +02:00
Alena Prokharchyk 2943dc22d7 CS-15717: fail to delete the network when corresponding network elements fail to be destroyed 2012-07-27 23:37:46 -04:00
kishan 9611a017e9 bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:37:46 -04:00
Wido den Hollander c894555924 setup: Add database upgrade for 3.0.3 to 4.0 
Also added a upgrade path from 3.X.X to 4.0, this should work.
 2012-07-27 23:37:46 -04:00
Sheng Yang b410cbff5f CS-15730: Prohibit create VPN connection from different gateway to same customer gateway 2012-07-27 17:41:47 -07:00
Sheng Yang 3c90fc842f CS-15704: Fix wrong domain id setting of non-root domain 2012-07-27 16:28:06 -07:00
Sheng Yang fd9ef34a0f CS-15719: Fix state change when stopping 2012-07-27 16:28:06 -07:00
Sheng Yang 8eee8f342e S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-27 16:28:06 -07:00
Sheng Yang 786d5995df S2S VPN: Add list function for normal users 2012-07-27 16:27:36 -07:00
Sheng Yang 736c4c1510 CS-15670: Allow normal users to configure S2S VPN 2012-07-27 16:27:36 -07:00
Sheng Yang 72a4b2f410 S2S VPN: Add name field for customer gateway 
Easier for user to identify the correct gateway
 2012-07-27 16:27:36 -07:00
Alena Prokharchyk fe2681fa10 VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-27 13:59:08 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk 110903a91a VPC: added vif info to ipassoc command 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-27 13:53:41 -07:00
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
 2012-07-27 13:47:46 -07:00
kishan 468f2720eb bug CS-15389: Added prepareStop to Virtualmachine manager and moved network usage collection into prepareStop of VR manager 2012-07-27 23:13:18 +05:30
Wido den Hollander 2a95258fe9 setup: Add database upgrade for 3.0.3 to 4.0 
Also added a upgrade path from 3.X.X to 4.0, this should work.
 2012-07-27 18:06:38 +02:00
chip.childers@gmail.com 6d15ba85d3 Removed Citrix license header. 2012-07-26 23:04:18 -04:00
Alena Prokharchyk 7d406bf3d1 Added missing action events for enable/disable static nat 2012-07-26 15:28:50 -07:00
Wido den Hollander 406fd95d87 Add RBD support for primary storage 
This patch adds RBD (RADOS Block Device) support for primary storage in combination with KVM.

To get this patch working you need:
- libvirt-java 0.4.8
- libvirt with RBD storage pool support (>0.9.13)
- Qemu with RBD support (>0.14)

The primary storage does not support all the functions of CloudStack yet, for example snapshotting is disabled
due to the fact that backupping up a RBD snapshot is not possible in the way CloudStack wants to do it.

Creating templates from RBD volumes goes well, creating a VM from a template however is still a hit-and-miss.

NFS primary storage is also still required, you are not able to run your System VM's from RBD, they will need
to run on NFS.

Other then these points you can run instances with RBD backed disks.
 2012-07-26 22:22:26 +02:00
Edison Su 50ffa95f63 ifix CS-15609 Volumes can be created as a part of VM creation when 
un-allocated space is insufficient on primary storage

check the availability of un-allocated primary storage space during
planning stage, for multiple-volume VM creation scenario
modification in StorageManagerImpl.java and StorageManager.java:
add a new method storagePoolHasEnoughSpace(List<Volumes>, StoragePool),
check if storagePool has enough space for all requested volumes
modification in FirstfitPlanner.findPotentialDeploymentResources:
handle multiple volume case, keep track of allocated volumes for pools
and call storagePoolHasEnoughSpace to check space availability
modification in AbstractStoragePoolAllocator.java:
extract capacity computation logic and make a new method in
StorageManagerImpl

RB: https://reviews.apache.org/r/6028/
Send-by: mice_xia@tcloudcomputing.com
 2012-07-26 10:10:18 -07:00
Sheng Yang 522bdf8163 S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd 2012-07-25 19:27:16 -07:00
Alena Prokharchyk 58a9b94dfb Fixed listNetworks by domainId/aclType=Domain 2012-07-25 14:50:56 -07:00
Pranav Saxena 3fedd56adb CS-12707: UI/API - templates> select view: ISOs filter by: featured or mine> provides unending pages of 2 ISO entries, DB contains only 19 ISO entrie- reviewed by Alena 2012-07-25 22:05:24 +05:30
Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 16:13:06 -07:00
Alena Prokharchyk 119e4e7443 VPC: CS-15681 - execute VPC related methods only when router is a vpc router 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-24 16:12:13 -07:00
Alena Prokharchyk 7d0338bd82 listPublicIpAddresses: when do join with nics table, count only non-removed nics 
Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-24 12:42:46 -07:00
Sheng Yang a00456bc57 CS-15676: Fix NPE when stop non-VPC router 2012-07-24 11:43:30 -07:00
Alena Prokharchyk c99b1d104a Fixed broken unittest 2012-07-24 10:30:39 -07:00
Sheng Yang 1920c2a735 CS-15534: Mark VPN connection as Disconnected when rebootRouter 
Conflicts:

	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-07-23 21:14:49 -07:00
Sheng Yang 6cb10ce993 S2S VPN: Add check for router status before apply vpn 2012-07-23 19:53:39 -07:00
Alena Prokharchyk 766b7a2706 Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
 2012-07-23 16:38:58 -07:00
Alena Prokharchyk 46cd99f01e VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones 2012-07-23 16:38:14 -07:00
Koushik Das 88f7872b81 CS-15279 
Issue happens when ROOT volume gets created and there is subsequent failure in starting the VM. During retry if allocator assigns a different storage pool the scenario was not handled. Now in case of local storage the volume get recreated on the newly assigned pool and old one gets cleaned up. In case of shared storage the existing volume is migrated to new storage pool.
 2012-07-23 14:49:04 -07:00
Sheng Yang b18d90af04 CS-15615: Fix Site2SiteVpnService injection 2012-07-23 14:46:17 -07:00
Sheng Yang 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
Sheng Yang 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
Sheng Yang 671475242c S2S VPN: Add domain and account for VPN 
Admin can add VPN connection for others

Conflicts:

	api/src/com/cloud/api/commands/CreateVpnConnectionCmd.java
	server/src/com/cloud/api/ApiResponseHelper.java
	setup/db/create-schema.sql
 2012-07-23 14:40:26 -07:00
Sheng Yang 230ce1dfee S2S VPN: Add state for vpn connection response 2012-07-23 14:38:06 -07:00
Sheng Yang 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
Sheng Yang 0dec6ea804 CS-15456: Prohibit creating more than one VPN gateway of VPC 2012-07-23 14:35:52 -07:00
Jessica Wang 830901d7cc cloudstack 3.0 API - listVpnConnections API - add gatewayIp, guestCidrList,ipsecPsk, ikePolicy, espPolicy, lifetime property (get it from customerGateway object). 2012-07-23 14:21:10 -07:00
Jessica Wang 196885e378 cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object). 2012-07-23 14:20:43 -07:00
Jessica Wang 8fad593ac5 cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response. 2012-07-23 12:14:59 -07:00
Jessica Wang aac0a808c1 cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response. 2012-07-23 12:10:29 -07:00
Alena Prokharchyk 9e5fb17e3d CS-15077: fixed listPublicIpAddresses in basic zone 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-23 11:21:28 -07:00
Alena Prokharchyk 7cf7002571 Merge branch 'master' into vpc 2012-07-23 10:57:55 -07:00
Alena Prokharchyk 7bef9a961d Resource tags: CS-15661 - don't accept NULL or empty key value when create resource tag 2012-07-23 10:51:20 -07:00
bfederle c8f72c9198 Merge branch 'master' into vpc 
Conflicts:
	ui/scripts/network.js
 2012-07-23 10:36:25 -07:00
Alena Prokharchyk 65551cff82 Resource tags: CS-15647 - delete resource tags when SG is expunged 2012-07-23 10:33:59 -07:00
Alena Prokharchyk 394f55d9e3 More logging to the VirtualRouter manager 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 966c1b0ad8 VPC: when VPC router gets destroyed and recreated, plug public nic for each Vlan where VPC public ips belong to 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Alena Prokharchyk cf895d34d2 CS-15622: always get router info from the DB 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 2b7ec3f4a8 VPC: one more fix for multiple public nic case for the VPC VR 
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-20 17:12:34 -07:00
Alena Prokharchyk 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
Jessica Wang 8712812ca7 cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response. 2012-07-20 16:49:17 -07:00
Alena Prokharchyk 9b4c578e0d More logging on nic release 2012-07-20 16:44:24 -07:00
Chiradeep Vittal 308cb36066 Unnecessary INFO log cluttering up the logs. Also make logs more informative 2012-07-19 16:35:45 -07:00
Alena Prokharchyk 8e648e4a98 Fixed update endpointe.url global config var 2012-07-18 15:47:37 -07:00
Alena Prokharchyk 281b23c2cd Fixed license headers 2012-07-18 14:52:13 -07:00
kishan f2bbf62d9d Added getUser API to get user details using API key. Services like S3 can user this API to authenticate. API is admin only. 2012-07-18 14:20:04 -07:00
Alena Prokharchyk 6ad2388c72 VPC: added one more default network offering for VPC - the one not having LB service 2012-07-17 17:46:17 -07:00
Alena Prokharchyk 519c4929bf VPC: fixed listPublicIpAddresses for the addresses with NULL network_id 2012-07-17 17:12:00 -07:00
Alena Prokharchyk d51719ddc3 Fixed unittest 2012-07-17 15:50:56 -07:00
Alena Prokharchyk 7c2b123d94 Merge branch 'master' into vpc 2012-07-16 15:43:16 -07:00
Alena Prokharchyk 097c260690 Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed 2012-07-16 15:43:06 -07:00
Alena Prokharchyk 47615a26b6 VPC: CS-15583 - hostName for the vm should be unique inside the network domain 2012-07-16 15:42:47 -07:00
Alena Prokharchyk a3d4ee3d87 VPC: CS-15598 - update ipVO object after getting system ip as a part of elastic LB 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-16 15:42:36 -07:00
Alena Prokharchyk 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
anthony 829acf6e27 CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator 2012-07-13 16:45:57 -07:00
Alena Prokharchyk 7a5efcc2e8 CS-15579 - perform check when account/domainId is passed to list call by the regular user 2012-07-13 15:59:15 -07:00
Alena Prokharchyk a1acfd3bfa Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/network/Network.java
	client/tomcatconf/components.xml.in
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
	setup/db/create-schema.sql
 2012-07-13 13:52:58 -07:00
Alena Prokharchyk 4dd71cb635 VPC: CS-15562 - get info about VR's guest networks from nics table 2012-07-13 13:35:18 -07:00
Alena Prokharchyk 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
Alena Prokharchyk d48d4c24e7 VPC: CS-15569/CS-15568 - release ip address from VPC when fail to enable static nat 
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-13 13:34:19 -07:00
Alena Prokharchyk ad80f426a0 VPC: CS-15553 and CS-15549 - more checks during automatic ip assoc to VPC network 
Conflicts:

	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-13 13:32:14 -07:00
Alena Prokharchyk 1781f706f9 VPC: added forVpc parameter to listNetworks api call. If true, list networks not belonging to any vpc 2012-07-13 13:27:10 -07:00
Alena Prokharchyk 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
Alena Prokharchyk eb52f4a610 VPC: mark gateway with Deleting state when all static routes are gone 2012-07-13 13:26:04 -07:00
Alena Prokharchyk 5923659dba VPC: CS-15548 - don't plug the nic for guest network to router when network not in Implemented state 2012-07-13 13:25:56 -07:00
Alena Prokharchyk b15c2576a7 VPC: fixed listStaticRoutes when search by gatewayId 2012-07-13 13:25:47 -07:00
Alena Prokharchyk a848ecae8b VPC: fixed logging 2012-07-13 13:25:39 -07:00
Prasanna Santhanam 3d7f6a35ad CS-15560 : Improve HVM logging of hosts 
When a host is not considered for deployment because it has disabled HVM, then call that out in the logs for debugging.

Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-13 10:51:56 -07:00
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
Edison Su 8b7b838c8a CS-15544: recreate router if router filesystem is crashed 2012-07-11 16:14:28 -07:00
Alena Prokharchyk ef8208af00 Merge branch 'master' into vpc 2012-07-11 13:18:51 -07:00
Alena Prokharchyk ab2669b01d CS-15459: fixed listTags by resourceType 2012-07-11 12:08:34 -07:00
Alena Prokharchyk 7cb4ab5e60 VPC: added State to vpc_gateways 2012-07-11 12:05:42 -07:00
Alena Prokharchyk d2e491a377 VPC: don't send staticRoutes in Revoke state to the VPC VR 2012-07-11 12:05:33 -07:00
Alena Prokharchyk b407b3beaa 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:07:45 -07:00
Alena Prokharchyk 697aa4589b VPC: unplugNic - release the nic in the DB only after the command is executed succesfully on the backend 
Conflicts:

	api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-10 18:07:09 -07:00
Alena Prokharchyk f59b935da5 VPC: CS-15519 - fixed ipAssoc when only zoneId parameter is passed in to the API call 
Conflicts:

	api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
	server/src/com/cloud/network/ExternalLoadBalancerUsageManagerImpl.java
 2012-07-10 15:20:39 -07:00
Sheng Yang ade3ae4e3c CS-15512: Fix delete vpn connection 2012-07-10 14:47:50 -07:00
Alena Prokharchyk c2f9417de4 VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method 2012-07-10 14:35:50 -07:00
Sheng Yang 94c62f2127 CS-15513: Fix group 5 of s2s vpn 
Conflicts:

	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-10 10:38:17 -07:00
Alena Prokharchyk 911ed25fbc Merge branch 'master' into vpc 2012-07-09 18:31:28 -07:00
Alena Prokharchyk c2134b431f VPC: CS-15505 - allocate guest nics when new VR starts in VPC 2012-07-09 18:30:58 -07:00
Alena Prokharchyk 525ba472e8 VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports 2012-07-09 18:23:58 -07:00
Alena Prokharchyk 55db112990 CS-15503: don't send Ips in Releasing state as a part of VPC VR start 2012-07-09 18:23:50 -07:00
Alena Prokharchyk 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
Alena Prokharchyk d52c6e2313 listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB 2012-07-09 18:13:32 -07:00
Alena Prokharchyk 10dcc117c3 VPC: CS-15486 - prepare public nic as a part of VR deployment 2012-07-09 18:12:54 -07:00
Deepti Dohare 29e90f8358 CS-15429: When an instance is created with data volume, account limit for this data volume was not checked against. Adding a check for that. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-10 06:02:30 +05:30
Alena Prokharchyk 84cdf2c28d CS-15459: fixed listTags by resourceType 2012-07-09 14:59:58 -07:00
Alena Prokharchyk a6086dc806 Removed @author tag from bunch of resources 2012-07-06 17:25:36 -07:00
Alena Prokharchyk 63d6941bdc ResourceTags: respect tag parameter in listTemplates/listIsos commands 
Conflicts:

	server/src/com/cloud/storage/dao/VMTemplateDao.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
 2012-07-06 16:59:14 -07:00
Alena Prokharchyk 5be0a3eeb1 VPC: fixed listNetworkACLs by networkId 
Conflicts:

	api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
 2012-07-06 16:43:39 -07:00
Alena Prokharchyk c9eb0c59bf VPC: allow adding private gateway to the VPC when the VR is in Stopped state 2012-07-06 15:28:07 -07:00
Alena Prokharchyk 818a3c72ac VPC: CS-15485 - dont' create a record for VPC VR private gateway nic in router_network_ref; do it for regular guest networks only 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
 2012-07-06 14:57:26 -07:00
Alena Prokharchyk 353423acec Merge branch 'master' into vpc 
Conflicts:
	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/dao/NetworkDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
 2012-07-06 12:04:10 -07:00
Alena Prokharchyk 85677b71fe Resource tags: CS-15473 - fixed delete/list by resourceId when UUID is specified as a value 
Conflicts:

	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/StaticRouteDaoImpl.java
	server/src/com/cloud/network/vpc/Dao/VpcDaoImpl.java
	server/src/com/cloud/projects/dao/ProjectDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk ec26e836fc CS-15459: fixed listTags for userVms 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 7acf8585b1 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)

Conflicts:

	api/src/com/cloud/api/commands/ListFirewallRulesCmd.java
	api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
	api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
	api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java
	api/src/com/cloud/api/commands/ListSnapshotsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/api/response/FirewallResponse.java
	api/src/com/cloud/api/response/IPAddressResponse.java
	api/src/com/cloud/api/response/VolumeResponse.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/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
	server/src/com/cloud/vm/dao/UserVmDaoImpl.java
 2012-07-06 11:43:31 -07:00
Alena Prokharchyk 7044fa695d VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP 2012-07-06 11:11:36 -07:00
Alena Prokharchyk e1fe1616d7 VPC: fixed CS-15465 - lb creation for ip not associated with any networks 2012-07-06 11:09:56 -07:00
Alena Prokharchyk e19e26ec4e VPC: don't fail when create/remove static route when VPC VR is in Stopped state 2012-07-06 11:09:15 -07:00
Alena Prokharchyk b13acc6459 VPC: don't allow vm to be a part of more than one VPC 2012-07-06 11:09:06 -07:00
Alena Prokharchyk d6774e6a86 VPC: don't allow vpcs for the same account with overlapping cidrs 2012-07-06 11:08:58 -07:00
Alena Prokharchyk 83f566cfe7 VPC: added "forVpc" (boolean) parameter to listRouters call - filter by the fact if router belongs to VPC or not 2012-07-06 11:08:48 -07:00
Alena Prokharchyk 234ae447ee VPC: added field networkacl_service_provided to physical_network_service_providers table 2012-07-06 11:08:39 -07:00
Alena Prokharchyk 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
Alena Prokharchyk b4fec75ff7 VPC: added dns1/dns2 + networkDomain to the list of bootload args passed on VPC VR start 2012-07-06 11:08:17 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 0dfe603d48 VPC: createLB rule - removed duplicated check for ip services when createLB rule 
Conflicts:

	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-06 11:07:26 -07:00
kishan 470cd120d1 Added ASF license 2012-07-05 12:28:15 -07:00
Edison Su 27e9cdbece add console proxy support for devcloud 2012-07-03 23:38:39 -07:00
Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc 
Conflicts:
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
 2012-07-03 17:32:50 -07:00
Alena Prokharchyk f2078afbd8 VPC: added zoneName to the VPC api response 2012-07-03 17:28:20 -07:00
Alena Prokharchyk 07d478d836 VPC: CS-15426 - In Basic zone always pass control nic when prepare nics for the VR 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:27:46 -07:00
Vijayendra Bhamidipati 023c2e4f59 Encrypting password values that are stored in the cluster_details table 2012-07-03 17:27:21 -07:00
Alena Prokharchyk 5afa83abb6 VPC: CS-15355 - fixed router when deployVm in Basic zone 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-07-03 17:25:07 -07:00
Alena Prokharchyk 21d87f3fa5 VPC: fixed response tag for VpcRespnse 2012-07-03 17:23:50 -07:00
Alena Prokharchyk da6d876cd4 VPC: added "forVpc" parameter to listNetworkOfferings command. If true, the offeirng can be used for vpc networks only 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/api/ApiDBUtils.java
 2012-07-03 17:23:40 -07:00
Alena Prokharchyk 2b799aa9ac VPC: added missing FirewallService to the VR provider 2012-07-03 17:22:41 -07:00
kishan b5563e832e Add Region APIs 2012-07-03 13:06:21 -07:00
kishan 6a1b0f3ecf Add Region APIs 2012-07-03 13:05:19 -07:00
Alena Prokharchyk 580261119c VPC: corrected the name for PublicIp interface (mistakenly renamed it as a part of previous checkin) 
Conflicts:

	server/test/com/cloud/network/MockNetworkManagerImpl.java
 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 5d5b584a8e VPC: remove network ACLs from VPC VR when shutdown guest network 2012-07-02 17:44:54 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk 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
Alena Prokharchyk 1ee0c30935 VPC: added vpccidr to the list of VPC router bootload args 2012-07-02 17:44:27 -07:00
Alena Prokharchyk 2dc1a286f6 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 
Conflicts:

	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2012-07-02 17:44:27 -07:00
Sheng Yang 8d16d7f94f Fix build after merge site to site vpn 2012-07-02 16:39:41 -07:00
Sheng Yang 5ee4b79688 CS-6840: Fix 0 id returned by createVpnConnection 2012-07-02 16:29:34 -07:00
Sheng Yang 1d97af3abf CS-6840: Add status checking for site 2 site VPN 2012-07-02 16:29:23 -07:00
Sheng Yang d9688f74ba CS-6840: List all objects without require parameter 2012-07-02 16:29:10 -07:00
Sheng Yang 8d4079d477 CS-6840: Add hypervisor commands for site-to-site vpn 
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
 2012-07-02 16:28:44 -07:00
Sheng Yang 0ce1e78364 CS-6840: Add Site2SiteVpnServiceProvider 2012-07-02 16:27:09 -07:00
Sheng Yang 24c480f9e6 CS-6840: Add commands for site-to-site vpn 
Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	utils/test/com/cloud/utils/net/NetUtilsTest.java
 2012-07-02 16:26:34 -07:00
Sheng Yang 9bb65b1126 CS-6840: Add data structure for site-to-site vpn tables 2012-07-02 16:20:58 -07:00
Deepti Dohare c8bbf04c81 CS-15300: Domain Admin accounts now respect the limits imposed on the domain just as a regular account. 
Signed-off-by: Nitin Mehta<nitin.mehta@citrix.com>
 2012-07-03 04:35:53 +05:30
Jason Bausewein 0449ae37f1 CS-15274: Fix NPE on CreateVlanIpRangeCmd() 
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
 2012-07-02 15:05:57 -07:00
Murali reddy 9876d34ea4 moving out ELB network element to plugins/network-elements/elastic-loadbalancer 2012-07-02 15:05:58 -07:00
Murali reddy 8aa2b55dd6 moving out NetApp code to plugins/file-systems/netapp 2012-07-02 08:34:02 -07:00
David Nalley e87558256c Patch from Chip Childers 
https://reviews.apache.org/r/5704/
License header updates for the server folder
 2012-07-02 09:51:21 -04:00
David Nalley ae4b66283a cleaning up some line endings 2012-07-02 09:50:28 -04:00
Wido den Hollander 1a2f354f4d Remove message about contacting Cloud support. 
CloudStack has gone Apache now.
 2012-07-01 15:12:43 +02:00
Alena Prokharchyk 1f01d923ca Merge branch 'master' into vpc 2012-06-28 17:44:08 -07:00
Alena Prokharchyk 634cd78baa Merge branch 'master' into vpc 
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/ListNetworksCmd.java
	api/src/com/cloud/api/response/NetworkResponse.java
	api/src/com/cloud/event/EventTypes.java
	api/src/com/cloud/network/NetworkService.java
	client/tomcatconf/commands.properties.in
	scripts/network/domr/getDomRVersion.sh
	scripts/network/domr/ipassoc.sh
	scripts/network/domr/l2tp_vpn.sh
	scripts/network/domr/networkUsage.sh
	scripts/network/domr/router_proxy.sh
	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/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/IPAddressDao.java
	server/src/com/cloud/network/dao/IPAddressDaoImpl.java
	setup/apidoc/gen_toc.py
	setup/db/create-schema.sql
	wscript
 2012-06-28 17:41:40 -07:00
Murali reddy c41094154d moving out OVS code to plugins/network-elements/ovs 2012-06-28 17:23:41 -07:00
Alena Prokharchyk 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
Alena Prokharchyk 24772bcb4e 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 17:18:15 -07:00
Alena Prokharchyk c19639e4a2 Static route can be created for generic VpcGateway now, not just Private gateway 2012-06-28 17:17:44 -07:00
Alena Prokharchyk 46b97cbf7d VPC: update public IP info in domain_router table once the VR gets the public nic 2012-06-28 10:25:24 -07:00
Alena Prokharchyk 308fd39a73 VPC: delete network ACLs as a part of network cleanup 2012-06-28 10:18:23 -07:00
Alena Prokharchyk 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 cec5012d5a VPC: fixed ip addres assignment in createLB rule 2012-06-28 10:18:03 -07:00
Alena Prokharchyk c8ec262dea 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-28 10:17:53 -07:00
Alena Prokharchyk 5ecdad7399 VPC: don't generate empty SetStaticRoute command during VR start when there are no static routes for the VPC 
Conflicts:

	server/src/com/cloud/user/AccountManagerImpl.java
 2012-06-28 10:17:34 -07:00
Alena Prokharchyk 09bd4e1725 VPC: fixed list public ips by vpcId 2012-06-28 10:16:22 -07:00
Alena Prokharchyk 42dac79e08 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-28 10:13:48 -07:00
Alena Prokharchyk 1140f081df 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-28 10:13:36 -07:00
Alena Prokharchyk a78fcedb5e VPC: added vpcId to SetStaticNatRule and CreateLoadBalancerConfig commands 
Conflicts:

	server/src/com/cloud/network/element/NetscalerElement.java
 2012-06-28 10:13:19 -07:00
Alena Prokharchyk 1a232171eb VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done 2012-06-28 10:11:41 -07:00
Edison Su 5f6387e113 add clouddev 2012-06-27 23:28:34 -07:00
Jessica Wang 3938c24b45 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:57:03 -07:00
Murali reddy 8197f1f07c moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware 2012-06-26 19:48:55 -07:00
Murali reddy 550b22576f Moving out XenServer support code into plugins/hypervisors/xen 2012-06-26 16:42:31 -07:00
Murali reddy cefbbb3850 moving random storage allocator to plugins/storage-allocators 2012-06-26 15:17:25 -07:00
Murali reddy 3ceb8d5667 moving out plaintext authenticator to plugins/user-authenticators 2012-06-26 14:33:27 -07:00
Murali reddy eb5e02e4e1 moving out MD5 authenticator to plugins/user-authenticators 2012-06-26 14:18:42 -07:00
Alena Prokharchyk 66e14e2627 Applied patch https://reviews.apache.org/r/5522/diff/ 2012-06-25 21:19:48 -07:00
Alena Prokharchyk ce876e24de VPC: intermidiate checkin to Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
 2012-06-25 21:00:57 -07:00
Alena Prokharchyk 8be74c033f VPC: update ip address object after the ip is associated with the network 2012-06-25 21:00:12 -07:00
Alena Prokharchyk 96c273ad55 VPC: finilize start for the VR - send ip assoc commands only after plug nic is done for all public nics 2012-06-25 21:00:00 -07:00
Alena Prokharchyk d35eb73c9b VPC: initial checkin for Static Routes 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:59:33 -07:00
Alena Prokharchyk 83ed35f06b 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 20:58:00 -07:00
Alena Prokharchyk b770c8b979 VPC: moved NetworkACL manager to the vpc folder 2012-06-25 20:57:50 -07:00
Alena Prokharchyk 4e7b65ef71 VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter 2012-06-25 20:57:37 -07:00
Alena Prokharchyk dc04e0b2e5 VPC: listPrivateGateways API implementation 2012-06-25 20:57:09 -07:00
Alena Prokharchyk d3ccc3a7de VPC: fixed NPE in network ACL delete (ip address is null for the rule of this type_ 2012-06-25 20:55:37 -07:00
Alena Prokharchyk 030458a37b VPC: implemented add/delete Private gateway 
Conflicts:

	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/dc/DataCenterVO.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2012-06-25 20:54:14 -07:00
Alena Prokharchyk 300110931c VPC: apply dhcp entries only after all guest nics are plugged 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:51:09 -07:00
Alena Prokharchyk 1b1e52ddb0 VPC: apply firewall ACLs as a part of VPC router start/restart and VPC network implement 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 2012-06-25 20:47:29 -07:00
Murali reddy 1a6102be1e moving LDAP authenticator to plugins/user-authenticators/ldap 2012-06-25 19:30:00 -07:00
Murali reddy 974ad65b01 moving out random host allocator to plugins/host-allocators/random/ 2012-06-25 18:47:47 -07:00
Murali reddy 621f2447bb Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod 2012-06-25 17:58:45 -07:00
Murali reddy 392ae5cb13 moving out Srx code into Plugins/network-elements 2012-06-25 16:55:53 -07:00
Murali reddy 422c4ce513 moving out F5 code from server into plugins/network-elements/f5/ 2012-06-23 14:16:59 -07:00
Vijayendra Bhamidipati 361ca9643d CS-15173: Additional Cluster is allowed to add with the same VSM IPaddress as the previous cluster 
Description:

    Restricting association of a Cisco Nexus VSM to a single
    cluster.
 2012-06-22 13:31:56 -07:00
Murali reddy 49b88472a5 moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler 2012-06-21 18:57:18 -07:00
Sheng Yang ae32736151 Fix compile-tests 2012-06-21 12:25:06 -07:00
Alena Prokharchyk 887970690b Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand 2012-06-21 10:02:33 -07:00
Wido den Hollander 85fc31ec7f Make the update proces of the SystemVM SSH keys more reliable. 
On systems where sudo is used "echo ~" might return the homedirectory from the user who executed the sudo command.

By specifically using "echo ~username" we make sure we get back the correct homedirectory.

The same story goes for when updating the key on disk.
 2012-06-21 11:56:54 +02:00
Alena Prokharchyk ccec9192a2 VPC: implemented delete and list Network ACL(s) 2012-06-20 17:20:04 -07:00
Alena Prokharchyk 374a600746 VPC: initial checkin for network ACLs 
Conflicts:

	client/tomcatconf/commands.properties.in
 2012-06-20 17:19:49 -07:00
Alena Prokharchyk 7fda6306b8 VPC: fixed user vm start in case when Implemented network existed w/o VR (it was expunged with DestroyRouter command) 2012-06-20 17:19:17 -07:00
Alena Prokharchyk d2abc0e275 canUseForDeploy is always false for system networks 2012-06-20 15:45:14 -07:00
Alena Prokharchyk 55a12582b4 Completed API / Management server code for Resource tags feature. UI is yet to be done 2012-06-20 15:45:08 -07:00
Alena Prokharchyk 62d45b9670 Initial checkin for resource tags feature 
Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/uuididentity/dao/IdentityDao.java
	server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java
	setup/db/create-schema.sql
 2012-06-20 15:45:08 -07:00
Wido den Hollander bc94948e06 agent: Set the listen addr of a VM specificly to the private IP of a host 
Now users have to modify their /etc/libvirt/qemu.conf vnc_listen, this is not needed anymore
 2012-06-20 15:29:26 +02:00
Alex Huang e2a32ab4f7 Introduced plugins directory. 
Moved ovm into plugins.
Introduced build.xml for ovm.
 2012-06-19 18:27:09 -07:00
Deepti Dohare e0860d5a48 CS-14345 Fixing for Login API also. 
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
 2012-06-19 23:07:31 +05:30
Alena Prokharchyk 19f648f1aa VPC: plug guest nic on guest network implement, and unplug on shutdown 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:09:46 -07:00
Alena Prokharchyk 89d7e54732 Network usage for VPC implementation 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:08:03 -07:00
Alena Prokharchyk 214782cc8c Don't send public/guest nic info when start VR in VPC 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-19 10:05:06 -07:00
unknown fc9a656b97 CS-14345 Logout API is not returning XML header 
Signed-off-by: Deepti Dohare <deepti.dohare@citrix.com>
 2012-06-19 14:26:18 +05:30
U-CITRITE\\koushikd 817595daf8 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. 
Signed-off-by: U-CITRITE\koushikd <koushikd@banlkoushikd01.citrite.net>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2012-06-19 06:53:43 +01:00
Sheng Yang 590b2332de 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:06:14 -07:00
saksham f6d16d0ab5 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:18:30 -07:00
Alena Prokharchyk 810151586b 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
	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
 2012-06-15 16:47:13 -07:00
Alena Prokharchyk 38215583ea Fixed lock problem when add vm to guest network 2012-06-15 14:33:32 -07:00
Alena Prokharchyk 9ae62d32cd Isolated non-vpc networks: start router with 3 nics from the very beginning 2012-06-15 14:33:14 -07:00
Alena Prokharchyk b3985a3b48 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-15 14:33:06 -07:00
anthony e69561b857 VPC : revert some change 2012-06-15 14:32:47 -07:00
Alena Prokharchyk 3e5f391c85 VPC: more changes to ipAssoc 2012-06-15 14:32:39 -07:00
Alena Prokharchyk 982562b9fb VPC: ipAssoc consists of 3 parts: plug nic (if needed), associateIp, enableSourceNat(if ip is source nat ip) 
Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2012-06-15 14:31:58 -07:00
Alena Prokharchyk c82885021b More logging to plug nic code 2012-06-15 14:27:49 -07:00
Alena Prokharchyk aa2b7d2d8c VPC: fixed guest network shutdown 2012-06-15 14:27:42 -07:00
Alena Prokharchyk 39422a3138 Release acquired lock for VPC 2012-06-15 14:27:33 -07:00
Alena Prokharchyk 7e119e4c94 Fixed addDhcpEntry/userdata/password in VPC setup 2012-06-15 14:27:24 -07:00
Alena Prokharchyk aa84256542 1) Added VpcVirtualNetworkApplianceService interface 
2) Pass dns1/dns2 to setupGuestNetworkCommand
3) Network implement - don't get source nat ip address for Vpc if it already has one
 2012-06-15 14:27:00 -07:00
Alena Prokharchyk d70d2f82d4 StartRouter: set only control nic during the initial router start; plug exising public and guest nics after the router is started with control nic 2012-06-15 14:25:31 -07:00
anthony 973ccdaf4b VPC : pass netmask once for secondary storage VM 2012-06-15 14:23:51 -07:00
Alena Prokharchyk 31b8f07bb5 Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton 2012-06-15 14:22:40 -07:00
Alena Prokharchyk 72974831a0 Modified virtual router startup procedure - initial start happens with control nic only; then we plug Public and then Guest nic to it 2012-06-15 14:22:19 -07:00
Alena Prokharchyk 0a7faa9838 Support for adding private network 
Conflicts:

	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
 2012-06-15 14:20:34 -07:00
anthony 396fa72ee3 1. move control network to eth0 on domr 
2. if it is basic mode, use guest NIC as Control NIC
 2012-06-15 14:18:38 -07:00