gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-02 21:38:30 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
15,328 Commits 369 Branches 328 Tags 877 MiB
add_remove_nics
Commit Graph

5927 Commits

Author SHA1 Message Date
Marcus Sorensen
437d30a295 Summary: allow admin user to do whatever he wants 
Reported-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359588792 -0700
 2013-01-30 16:33:12 -07:00
Marcus Sorensen
e8fcdcbfe5 Merge branch 'master' into add_remove_nics 2013-01-30 13:55:29 -07:00
Wido den Hollander
301c4413bc CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users 
When an admin calls this command without the ID parameter do not set the domain's ID
to the ID where the admin is in, this prevents him from doing lookups.
 2013-01-30 15:48:01 +01:00
frank
1f7eaf3d61 CloudStack CLOUDSTACK-774 
Supporting kickstart in CloudStack baremetal

merge baremetal feature to master
 2013-01-29 17:19:57 -08:00
Marcus Sorensen
89d8a478e0 Summary: Don't allow a vm to join a network if another VM of same name exists 
Submitted-by: Brian Angus <brian@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359507543 -0700
 2013-01-29 17:59:03 -07:00
Marcus Sorensen
aff919eab3 Summary: Add tests, streamline code by removing custom addUserVmToNetwork 
Submitted-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Ryan Dietrich <ryan@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359494800 -0700
 2013-01-29 14:26:40 -07:00
Andrew Bayer
71835018e5 CLOUDSTACK-249: Add hostId to failed VM deploy alerts 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-28 15:27:09 -08:00
Marcus Sorensen
52c35a89a6 Summary: Check network for same DNS name when adding VM to network 
Detail: Can't add VM of same name to network where name already exists, will
break DNS in virtual router.

Submittted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359400901 -0700
 2013-01-28 12:21:41 -07:00
Marcus Sorensen
ea7fbd6b4f Merge branch 'master' into add_remove_nics 2013-01-25 22:23:42 -07:00
Marcus Sorensen
4d369994d4 Summary: Remove some todo lines that have been addressed 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359158121 -0700
 2013-01-25 16:55:21 -07:00
Marcus Sorensen
072521c358 Summary: Make calls async, add sanity checks on vm state and zone location 
Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359154458 -0700
 2013-01-25 15:54:18 -07:00
Min Chen
17c419ceb4 Fix a bug in listHosts that returns wrong zoneId for host. 2013-01-25 14:18:25 -08:00
Marcus Sorensen
7de4583d8e Summary: Fixed a bug when trying to change the default NIC when the default nic 
was already on the same network as the nic you were trying to make the default.

Reported-by: Brian Angus <blangus@betterservers.com>
Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359070121 -0700
 2013-01-24 16:28:41 -07:00
Marcus Sorensen
bdbbbc36e7 Summary: Allow adding of more than one nic on the same network 
Detail: Cloudstack allows you to launch a VM with two or more nics on the
same network, so this allows you to add more than one nic on the same network
after deployment

Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359063744 -0700
 2013-01-24 14:42:24 -07:00
Rohit Yadav
a7fd74f94a ApiDispatcher: Fix uuid->id translation and throw better debug statement 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
b335684ec5 EntityManager: Implement method to search by uuid including removed entities 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
7a927e36f0 ReflectUtil: Use collections to grow list and not manual array memory management 
Fix usage in ApiDispatcher. Add two kinds of helpers:
- One that gets list of exclude cmd whose fields are not be included
- One that loops till a base class is asssignable from superclass

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
a8623bacd7 ApiXmlDocWriter: Fix multiple field occurence in apidocs by using set 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Marcus Sorensen
ed12b2304f Summary: Add/remove nic capability while VM is running 
Submitted-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358979747 -0700
 2013-01-23 15:22:27 -07:00
Min Chen
485761f0b4 Fix a bug for listZones and listServiceOfferings for normal user, caused 
by a misuse of SearchCriteria class.
 2013-01-23 10:17:08 -08:00
Hugo Trippaers
1e40551cd5 Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires 
a database connection which we don't have during unittest phase.
 2013-01-23 08:46:53 +01:00
Min Chen
c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
Min Chen
26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 
listZonesByCmd.
 2013-01-22 16:39:45 -08:00
Marcus Sorensen
2e14cf5b57 Summary: Allow for same vlan num on different physical NICs 
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.

BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
 2013-01-22 12:05:55 -07:00
Min Chen
6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count 
for ListServiceOfferingsCmd.
 2013-01-21 15:25:49 -08:00
Min Chen
6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for 
listDiskOfferingsCmd.
 2013-01-21 10:50:10 -08:00
Hugo Trippaers
04d93ef0aa Use the user.home property instead of a bash thing. See 
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
 2013-01-21 11:56:53 +01:00
Marcus Sorensen
68b236cd2d Summary: Changes required for network refactor branch 
Reported-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358554509 -0700
 2013-01-18 17:15:09 -07:00
Marcus Sorensen
42e4961da2 Merge branch 'master' into add_remove_nics 
pulling in network-refactor merge to master

Conflicts:
	server/src/com/cloud/network/NetworkManagerImpl.java
 2013-01-18 15:24:08 -07:00
Min Chen
2955d58976 Fix "Count" for listSnapshotPoliciesCmd. 2013-01-18 13:55:11 -08:00
Min Chen
5a865462e9 Merge branch 'api_limit' 2013-01-18 09:43:54 -08:00
Chiradeep Vittal
ce4b49d30b network-refactor merge: fix nonoss build 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-18 09:38:49 -08:00
Koushik Das
e45a9f3aed CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 17:20:51 +05:30
Koushik Das
070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Kishan Kavala
51c1ca7cbe CLOUDSTACK-1010: Fix count issue for listHosts command 2013-01-18 16:13:25 +05:30
Min Chen
2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Rohit Yadav
b120e19280 ApiDispatcher: In case of incorrect long int value or uuid, throw error 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 17:59:53 -08:00
Koushik Das
cd37e22f9b CLOUDSTACK-810: Make DirectAgent thread pool size configurable Removed hard-coding of directagent thread pool size and now reading it from configuration 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-17 17:21:52 -08:00
Rohit Yadav
f264571e92 ApiServer: Fix default reponse type for apiserver on intergration port to xml 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 17:03:27 -08:00
Chiradeep Vittal
2d19f3b052 network-refactor: merge stomped on a logical not' 2013-01-17 16:59:48 -08:00
Min Chen
86ada92ffa Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
Marcus Sorensen
c093d650c7 Summary: Initial code commit, applying https://reviews.apache.org/r/9011/ 
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358452852 -0700
 2013-01-17 13:00:52 -07:00
Chiradeep Vittal
56cd809600 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 
Re-merge with network-refactor
 2013-01-17 11:32:49 -08:00
Min Chen
c1a540c6bb Merge branch 'master' into api_limit 
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:48:22 -08:00
Min Chen
3dabd5fbf3 Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException 
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.

Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-01-16 22:36:34 -08:00
Min Chen
06fa338d42 Add some tests for api rate limit plugin. 2013-01-16 21:56:25 -08:00
Min Chen
bdcfa1919b Clean up ApiServer, ApiServlet and ApiDispatcher in handling various 
exceptions, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
 2013-01-16 21:52:48 -08:00
Chiradeep Vittal
d9e36ac37b network-refactor: fix license issues 
Fix build after merge of network-refactor
 2013-01-16 19:25:23 -08:00
Prachi Damle
4d4fb9c959 https://issues.apache.org/jira/browse/CLOUDSTACK-993 
Changes:
- Introduction of maven skipped the java code that inserts the admin user. This causes the NPE in management server while trying to find the user and also, admin user cannot login as expected.
- Fixing the insertion of the admin user as part of startup.
 2013-01-16 19:18:59 -08:00
Chiradeep Vittal
cadca5fc0c Merge branch 'master' into network-refactor-merge2 
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
	server/src/com/cloud/acl/DomainChecker.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
 2013-01-16 19:17:14 -08:00