feb342ad23
api_refactor: refactor autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:30:37 -08:00
456b852c0c
api_refactor: refactor loadbalancer apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:25:20 -08:00
8773fc2a55
api_refactor: refactor volume apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:20:48 -08:00
25b5aadb4e
api_refactor: refactor firewall apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:17:06 -08:00
5cd1f4b6c2
api_refactor: ip address apis refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:14:06 -08:00
46ed598894
api_refactor: resource (limit) apis, move capability and cloud identifier
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:11:16 -08:00
7f9c490b5a
api_refactor: move listzones and listcapabilities to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 11:06:34 -08:00
a34fc1f1a7
api_refactor: move listcapabilites to dc
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:44:17 -08:00
658cf56120
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:38:53 -08:00
6fe1b5f9b0
api_refactor: move diskoffering to offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:37:14 -08:00
1b8dc65f3a
api_refactor: refactor user (vpn) apis
...
- Fix refactored apis, mappings in commands*.in
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 10:27:47 -08:00
cabbc7bd7d
api_refactor: refactor disk api (only user)
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:31:03 -08:00
ea79162615
api_refactor: refactor configuration api for normal user
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:29:17 -08:00
28df57ec75
api_refactor: refactor serviceoffering apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:27:19 -08:00
73d1099c76
api_refactor: rename sg to securitygroup
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:25:22 -08:00
1e51d6c1ab
api_refactor: refactor guest os (guest) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:19:39 -08:00
b673c21174
api_refactor: refactor job (async jobs) apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:12:17 -08:00
7ac48798b4
api_refactor: refactor event apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-04 00:05:54 -08:00
add1b9b055
api_refactor: refactor register apis
...
- Split register apis across template, iso and ssh pkgs
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:54:19 -08:00
316e7f226a
api_refactor: refactor tag apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:48:48 -08:00
37cd76ee81
api_refactor: refactor ssh apis
...
- Fix refactored apis, mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:44:14 -08:00
9a0df30766
api_refactor: refactor account apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:42:13 -08:00
46353e0916
api_refactor: refactor vmgroup apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:35:30 -08:00
a033cf1bfc
api_refactor: refactor snapshot apis
...
- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:19:12 -08:00
0df9538fb7
api_refactor: refactor security group (sg) apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:11:17 -08:00
3e0b2164be
api_refactor: refactor template apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:05:44 -08:00
e0b4430070
api_refactor: refactor iso apis
...
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.
- Note: copyIso uses copyTemplate, refactor copyTemplate
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 23:01:29 -08:00
47ae62e44a
api_refactor: refactor network apis
...
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 22:47:07 -08:00
ac1ea7616a
api_refactor: refactor vpc apis
...
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:44:40 -08:00
6fc3bc3760
api_refactor: refactor vpn and vm apis
...
- Refactor VPN and VM APIs to admin and user pkgs
- Names space, org.apache.cloudstack
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-03 21:27:02 -08:00
5edfc2760a
refactor: remove redundant imports, fix trailing chars
2012-12-03 13:54:37 -08:00
7857b1f62a
CLOUDSTACK-573: check if external provider enabled, only when finalize the service/provider list for the network
2012-11-30 13:07:01 -08:00
1aa4ad6a3c
CLOUDSTACK-572: Advance SG enabled zone - allow deploying vm in SG disabled Account specific networks
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-30 12:47:37 -08:00
a2306f4917
some more poc work
2012-11-29 16:10:09 -08:00
073863249a
Some ACL POC work
...
Conflicts:
server/src/com/cloud/api/ApiDispatcher.java
2012-11-29 16:09:47 -08:00
6036f73725
Removed that darn exceptions when cloudstack is running in windows. It's a simple or check that was written as an and check
2012-11-29 13:35:23 -08:00
a28f4cac3c
HttpClient needs releaseConnection method call
...
reviewboard: https://reviews.apache.org/r/8186/
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-29 20:23:30 +01:00
e4a5173199
CLOUDSTACK-505: Do not log the command response object for the createSSHKeyPair command.
...
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-29 12:24:42 -05:00
5724f1ca96
fix build
2012-11-26 11:49:51 -08:00
e436d4327f
create volume from template unit test is passed
2012-11-26 11:42:34 -08:00
55447c2572
CLOUDSTACK-424: Fix NPE while updating user data
...
Replace newlines in userdata only when it's not null.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-21 18:27:11 +05:30
550f4fbcdc
create template/primary data store is done
2012-11-20 18:57:19 -08:00
573d13dd7c
starting unit test
2012-11-20 18:57:19 -08:00
2a0d0104bd
maven : declare mysql-connector-java dependency into dependencyManagement section of cloudstack pom and use the version 5.1.21 only
...
Signed-off-by: Hugo Trippaers <trippie@gmail.com>
2012-11-20 09:27:07 +01:00
c8832cd4b6
Commit https://reviews.apache.org/r/8075/
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2012-11-19 12:02:26 +01:00
88180fc139
Summary: Direct template imaging for CLVM, bypass copy template to primary
...
Detail: Because of the way most other primary storage types work with cloudstack
(i.e. backing stores) CLVM actually copies the template to a local logical
volume on primary storage, then uses that. This causes all of your primary
storage to be littered with a copy of every template used. Since we're not
using these, dump the template direct to the newly created logical volume.
This is faster as well since the template is sparse; we're not creating a fat
template on primary storage and then copying that to a logical volume when we
deploy from template.
BUG-ID: CLOUDSTACK-508
Bugfix-for: 4.1
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1353221260 -0700
2012-11-17 23:47:39 -07:00
f25a78111f
CLOUDSTACK-493: 22x-30 upgrade for Advance SG enabled zone
...
* enable SG provider if the zone is SG enabled
* don't create public traffic type for the zone if there is no public network exist in the zone in 2.2.x
2012-11-16 10:00:45 -08:00
264f777a2d
Remove AutoScale entities while deleting autoscaled loadbalancer.
2012-11-16 12:56:32 +05:30
aea87da410
Autoscale:Sending the Counter params as list
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-11-16 11:07:24 +05:30
affc162556
AutoScale: Fixing issues that occurred during rebase with master
2012-11-16 11:04:37 +05:30
527b5c8ee2
Autoscale: Supporting network element independent counter parameters Reviewed-By:Devdeep
2012-11-16 10:57:00 +05:30
35b0e086d4
enable Autoscale VMs to be named as Autoscale-LB-<lbname>
2012-11-16 10:56:59 +05:30
57416188a2
Enabling aUtoscale VMs to be provisioned in a loadbalancer's network
2012-11-16 10:56:59 +05:30
bf1e6ed991
CS-15644-Autoscale: Implemented UUIDs for templateId-serviceOff Reviewed-By:Vijay
2012-11-16 10:56:58 +05:30
3e32a29048
Autoscale:Changes for addressing AutoScale bugs CS-15930, CS-15931, CS-15934, CS-15935
2012-11-16 10:56:58 +05:30
c1b4bc448c
AutoScale. Check vm group's interval during update with existing policiy's duration
2012-11-16 10:56:58 +05:30
d2155890cc
CS-16168:AutoScale- Deletion of Account doesn't delete the AutoScale LB rule
2012-11-16 10:56:57 +05:30
58db4d0d88
CS-15729:AutoScale. Aligning the NetScaler response time counter, and correcting duration check against interval
2012-11-16 10:56:57 +05:30
68fc64cfe9
CS-16159-Fixing the license headers
2012-11-16 10:56:56 +05:30
6daff57fdd
CS-15744:Incorrect error message with disable autoscaleVmgroup operation- patch sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
e9a4a7b1e6
CS-15745:Incorrect error message with update autoscaleVMgroup :patch-sent by Deepak Garg (deepakgarg.iitg@gmail.com)
2012-11-16 10:56:45 +05:30
f96810b9ae
AutoScale. Adding default counters
...
Conflicts:
server/src/com/cloud/server/ConfigurationServerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-304to305.sql
2012-11-16 10:56:44 +05:30
dda4d39b55
AutoScale changes in Apache master
2012-11-16 10:56:44 +05:30
7a3ffb47e6
Add pipeline concept to RPC facility, fix javelin build issue
2012-11-15 16:15:24 -08:00
4c86b1545d
CLOUDSTACK-424: Update userdata should propagate to VR
...
The code that would propage userdata to router, when updateVirtualMachine api
is called, was missing. As per the docs [0], userdata should be a base64 encoded
string upto 2KB which is put on domr's html directory adn using HTTP GET the
userdata information can be obtained from the domr.
The updateVirtualMachine api [0] would accept a base64 encoded string
and decoded and put into the domr's /var/www/html/userdata/<uservm ip>/user-data
file. The operation does not require the VM to be in stopped state, though it is
advised to stop and call this api in case the user vm has a script which gets
the userdata information from domr while starting.
For example, this script can be used to fetch the data:
server_ip=$(grep dhcp-server-identifier /var/lib/dhclient-eth0.leases | tail -1 | awk '{print $NF}' | tr '\;' ' ')
wget http://${server_ip}/latest/user-data
This feature can be useful, for example to use into puppet facts [1], or to do
automation and horizontal scaling etc. based on userdata.
[0] http://incubator.apache.org/cloudstack/docs/api/apidocs-4.0.0/domain_admin/updateVirtualMachine.html
[1] http://geek.jasonhancock.com/2011/11/09/cloudstack-userdata-into-puppet-facts/
BUG-ID : CLOUDSTACK-424
Reviewed-by: Rohit Yadav <bhaisaab@apache.org>
Reported-by: Nick Wales
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-15 18:43:51 +05:30
fe460fac43
Upgrading a network that has Network offering SRX/F5 inline mode to a network offering that has all service provided by VR does not give proper error message: Hence correcting the error message
2012-11-15 13:52:54 +05:30
2cae511464
Connnect event bus to messaging layer
2012-11-14 19:28:59 -08:00
2914985837
Fixed json response to return "size" parameter (resources count in the system) when pageSize=0 is specified
2012-11-14 15:01:48 -08:00
6d9cafbf35
DeployVm: when SG enabled network is passed to the command, but no SG list is defined in the request, add the vm to SG enabled network automatically
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-11-14 15:01:35 -08:00
74622a4dc3
Fixed listNetworks for the case when a) caller is an admin 2) projectId=-1 is specified - admin wasn't able to list networks belonging to regular users' projects
2012-11-14 14:59:51 -08:00
499a28cb43
Removed redundant imports from VolumeHostDao
...
Signed-off-by: Laszlo Hornyak <lhornyak@redhat.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 1352883689 +0530
2012-11-14 14:31:29 +05:30
b38d9b82b6
CloudStack messaging refactoring skeleton
2012-11-13 17:59:39 -08:00
67490f75e6
Display the reason which failed certificate generation fails
...
within cloud.server.ConfigurationServerImpl.generateDefaultKeystore
Description:
The reason which failed in generation of the certificate is not displayed now.
At that time, IOException which does not include the reason is raised.
In order to solve the problem quickly, the reason should be included in the message.
(Now)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
(Fix)
WARN [cloud.server.ConfigurationServerImpl] (main:) Would use fail-safe keystore to continue.
java.io.IOException: Fail to generate certificate!: sudo: sorry, you must have a tty to run sudo
at com.cloud.server.ConfigurationServerImpl.generateDefaultKeystore(ConfigurationServerImpl.java:490)
Testing Completed:
mvn clean install
mvn -pl :cloud-client-ui jetty:run
And generation of the certificate was made to fail, checked it.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2012-11-09 14:25:44 -05:00
f365426b99
temp changes
2012-11-08 23:37:30 +05:30
d118a3d764
Fixed the bug in xml response serializing (introduced while resolving merge conflict)
2012-11-07 17:17:17 -08:00
d79f1f6fdc
Replace Adapters and PluggableServices, use Spring to load them
2012-11-07 15:03:24 -08:00
453b31f3f4
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
2012-11-07 15:03:23 -08:00
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
476e771c1c
SSH key changes
2012-11-05 11:24:33 -08:00
b101dc7279
KVM agent connet:
...
* send StartupAnswer right after StartupCommand is recieved
* if post processor going wrong, send out readycommand with error message to agent, then agent will exit
2012-11-05 10:00:16 -08:00
91e68b5f2c
A bunch of .project changes again
2012-11-04 19:25:03 -08:00
d8fbb0dd13
maven: enable jvm heap size for forked surefire test processes
...
Any forked process that runs from maven surefire plugin gets it own separate
heap which may cause build issues. Patch fixes the issue by explicity args to
the surefire plugin for cloud-server.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-11-03 18:42:51 +05:30
1f458983af
CS-16310: don't process Disconnect when:
...
* attache is not forForward()
* and the Disconnect came through cluster notification event
The fix will prevent delayed AgentDisconnect cluster notification processing.
2012-11-02 10:51:39 -07:00
013102c028
CS-16611: when expunge Async job, expunge corresponding sync queue items
...
Conflicts:
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDao.java
2012-11-02 10:51:29 -07:00
fe41325e96
ApiResponseSerializer - replaced all occurrences of string concatenation with StringBuffer.append
...
Conflicts:
server/src/com/cloud/api/response/ApiResponseSerializer.java
2012-11-02 10:50:04 -07:00
04a3c4ffdc
Removed unneeded if statement from VpcVirtualNetworkApplianceManagerImpl
2012-11-02 10:47:34 -07:00
efb5f85aad
CS-16594: when request is cancelled by the remote peer, in addition to cancelling the request, unblock the agent queue if the request is the current request
2012-11-02 10:47:24 -07:00
a5077968db
CS-16592: process handleConnectedAgent in a separate thread pool
2012-11-02 10:47:14 -07:00
3948d7d7c5
CS-16213: skip agent rebalancing when the management server doesn't own the host any more
2012-11-02 09:59:37 -07:00
62607c9a75
HandleDisconnect - don't update the DB when the disconnect event is happening as a part of MS Cluster notification
...
Reviewed-by: Frank Zhang
2012-11-02 09:59:37 -07:00
36babbfcac
CS-16213: agent LB - don't process Disconnect event from other management server in cluster, if the recipient is the future owner of the host. The disconnect will be handled during the rebalance host connection process itself.
...
Reviewed-by: Kelven Yang
2012-11-02 09:59:37 -07:00
705130e42c
CS-16499: removed useless txn.commit statement. Used to call it to ensure that the lock() on nic object will get removed even in case when we don't do the DB update. But our Transaction code does it automatic
2012-11-02 09:59:37 -07:00
597bc8c66c
CS-16499: forgot to add @DB to releaseNic() call
2012-11-02 09:59:36 -07:00
7bd7884f57
CS-16499: releaseNic - lock the nic row in the DB before checking its state. Hold the lock till the nics attributes + nicCount is updated
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-11-02 09:59:36 -07:00
772f660c33
Changed the create database steps to be create from a single create-schema.sql and then apply database modifications
2012-11-01 13:40:15 -07:00
db6c8f0176
CLOUDSTACK-439: Fixed typos and changed direct attached to shared network IPs
2012-11-01 14:12:49 -05:00
3423c5d74f
add volume service skeleton
2012-10-30 17:34:46 -07:00
f65b268a2e
Active the testrun by default in maven
...
Exclude the tests that need a database, these should move to the
integration test phase or use an in memory database maybe.
2012-10-30 14:15:07 +01:00
bd58ceccd8
Summary: Make the authenticator responsible for encoding the password and add a SHA256 salted authenticator
...
The authenticators now have an encode function that cloudstack will use to encode the user supplied password before storing it in the database. This makes it easier to add other authenticators with other hashing algorithms. The requires a two step approach to creating the admin account at first start as the authenticators are only present in the management-server component locator.
The SHA256 salted authenticator make use of this new system and adds a hashing algorithm based on SHA256 with a salt. This type of hash is far less susceptible to rainbow table attacks.
To make use of these new features the users password will be sent over the wire just as he typed it and it will be transformed into a hash on the server and compared with the stored password. This means that the hash will not go over the wire anymore.
The default authenticator in components.xml is still set to md5 for backwards compatibility. For new installations the sha256 could be enabled.
2012-10-30 12:56:56 +01:00
d70154609a
Wire up injection for dynamically constructed objects
2012-10-29 16:16:07 -07:00
a2d50c7e43
fix build
2012-10-29 12:55:15 -07:00
ce60cfee85
CS-16585: cloudstack 3.0 API - listProjects API - throw an API error if account is specified but domain is not.
2012-10-29 11:19:29 -07:00
e24456f487
[CLOUDSTACK-415] Workaround this problem for now
2012-10-29 09:26:14 +01:00
e59726ad95
[CLOUDSTACK-359] Hook up the other side of the event propagation
2012-10-26 14:25:14 +02:00
a388a748d0
Added a database creator class. not working yet. Edison will look at it
2012-10-25 17:34:54 -07:00
7b7f4cd1fd
CLOUDSTACK-409: ThreadLocal Transaction and its db connection got reset for user managed db connnection, causing ClusterHeartBeat thread frequently trying to get db connection. Add unit test to test user managed transaction.
2012-10-25 13:06:50 -07:00
f92ce72639
Correct dependency errors
2012-10-24 11:12:40 -07:00
059f605ace
add more interfaces
2012-10-22 17:50:51 -07:00
b57be3389e
add apidocs/devcloud projects
2012-10-21 00:01:47 -07:00
8e59b3acfb
Architecture refactoring - Stateless management server - Spring Framework initiatives, add missing files
2012-10-19 15:32:24 -07:00
214bbf3ebd
CLOUDSTACK-279: fixed deleteProject when executed by the regular user. Always pass System account as a caller when do account cleanup
...
Conflicts:
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
server/src/com/cloud/network/element/CiscoNexusVSMElement.java
server/src/com/cloud/network/element/ElasticLoadBalancerElement.java
server/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/element/NetscalerElement.java
server/src/com/cloud/network/element/OvsElement.java
server/src/com/cloud/network/element/VpcJuniperSRXExternalFirewallElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/storage/StorageManager.java
2012-10-17 17:26:19 -07:00
c40aac0add
Add Mock managers for Regio API server
2012-10-17 17:02:13 +05:30
f0f33bf4da
Added Mock ApiServer, Regions API calls with api keys
2012-10-17 14:16:36 +05:30
a9fab0526b
CLOUDSTACK-348: decrement resource count when the network gets removed
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-10-16 16:18:36 -07:00
9d07ad8ecb
CLOUDSTACK-304: default number of concurrent snapshots is NULL (unlimited) - to provide backwards compatibility for existing customers.
...
Conflicts:
setup/db/db/schema-305to306.sql
2012-10-16 11:25:05 -07:00
3f5733cea7
CS-16412: fixed count for following commands:
...
listVlanIpRanges
listOsCategories
listOsTypes
listSystemVms
listPhysicalNetworks
listCounters
listConditions
listAutoScalePolicies
listAutoScaleVmProfiles
listAutoScaleVmGroups
listConfigurations
listStoragePools
listClusters
listPods
listInstanceGroups
listSSHKeyPairs
listHypervisorCapabilities
listNetworkServiceProviders
listVpnCustomerGateways
listVpnGateways
listVpnConnections
listProjects
listProjectAccounts
listProjectInvitations
listTrafficTypes
Conflicts:
api/src/com/cloud/api/commands/ListAutoScalePoliciesCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmGroupsCmd.java
api/src/com/cloud/api/commands/ListAutoScaleVmProfilesCmd.java
api/src/com/cloud/api/commands/ListConditionsCmd.java
api/src/com/cloud/api/commands/ListCountersCmd.java
api/src/com/cloud/api/commands/ListVpnConnectionsCmd.java
api/src/com/cloud/api/commands/ListVpnCustomerGatewaysCmd.java
api/src/com/cloud/api/commands/ListVpnGatewaysCmd.java
api/src/com/cloud/network/as/AutoScaleService.java
server/src/com/cloud/network/as/AutoScaleManagerImpl.java
server/src/com/cloud/network/as/dao/CounterDao.java
server/src/com/cloud/network/as/dao/CounterDaoImpl.java
server/src/com/cloud/projects/ProjectManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-10-15 18:16:59 -07:00
0a7d03c90b
javelin is revived
2012-10-15 15:42:59 -07:00
112143def6
add templateprofile
2012-10-15 14:10:49 -07:00
1d458c7a2d
CLOUDSTACK-347: ipAddressResponse/NetworkResponse API - return vlan info only when the caller is ROOT admin
2012-10-15 11:39:38 -07:00
8f2d9a09e5
CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands
...
Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
api/src/com/cloud/api/commands/ListVMsCmd.java
api/src/com/cloud/api/commands/ListVolumesCmd.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.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
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2012-10-12 13:58:59 -07:00
5d7509e964
Merge DB query builders from master
2012-10-11 18:24:33 -07:00
5fee891162
merge from master
2012-10-11 17:42:25 -07:00
513b680d96
CLOUDSTACK-316: if public network is not specified, set to guest network
2012-10-11 16:46:23 -07:00
6dd5c3fd42
CLOUDSTACK-70: Improve restart network behaviour for basic network
...
If cleanup=true, network elements and resources are shutdown and
reimplemented. Else, shutdown/reimplementation is skipped. Enabled
cleanup checkbox in CS UI.
For both cases, VRs are only deployed for Pods with no running
or starting VRs and Pods having running or starting user vms.
New DAO helpers introduced:
HostPodDao: listByDataCenterIdVMTypeAndStates
DomainRouterDao: listByPodId and listByPodIdAndStates
VMInstanceDao: listByPodId and corrected definition of listByTypeAndState
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-10-11 19:33:26 +05:30
339aa41442
CLOUDSTACK-304: Synchronization support for createSnapshot command - don't sent more than "concurrent.snapshots.threshold.perhost" createSnapshots commands to the backend host.
...
Conflicts:
core/src/com/cloud/async/AsyncJobVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/async/AsyncJobManagerImpl.java
server/src/com/cloud/async/SyncQueueManager.java
server/src/com/cloud/async/SyncQueueManagerImpl.java
server/src/com/cloud/async/dao/SyncQueueDao.java
server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java
server/test/com/cloud/async/TestSyncQueueManager.java
setup/db/create-schema.sql
2012-10-10 13:40:00 -07:00
c36744a18c
Fixed deployVR - used to fail in case when system.vm.default.hypervisor was set to not NULL value
2012-10-10 13:05:39 -07:00
839929b9b2
Fixed lineendings and trailing whitespaces in a bunch of files
...
Conflicts:
core/src/com/cloud/async/SyncQueueItemVO.java
core/src/com/cloud/async/SyncQueueVO.java
server/src/com/cloud/async/dao/SyncQueueDaoImpl.java
server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java
2012-10-09 17:17:36 -07:00
290e8954f7
Removed more unused imports in Snapshots code
...
Conflicts:
server/src/com/cloud/storage/dao/SnapshotScheduleDao.java
2012-10-09 17:07:03 -07:00
823f0c9669
Fixed ipAssoc and createNetworkACL (for vpc) commands - didn't work in Project scenario
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-10-09 16:26:26 -07:00
43b406279a
listTemplates/listIsos - template filter "all" can be specified by admin only. Throw an error when user tries to use it
2012-10-09 16:23:05 -07:00
c9aa9a5557
CLOUDSTACK-287: don't allow API call against system account (adding users to system account is prohibited; can't delete/update System account)
...
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2012-10-09 09:37:27 -07:00
ffa5276222
Fixed CLOUDSTACK-287
...
1) Always fail to authenticate system user.
2) DB - always create system user with RANDOM not null password
3) Don't allow modifying (setting api/secretKeys, etc) system user via API
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/db/schema-305to306.sql
2012-10-09 09:37:27 -07:00
a5bca0999a
CLOUDSTACK-118 Status of host resorce stuck in ErrorInMaintenance
2012-10-08 14:05:05 +08:00
436960d2aa
Fixed unittest
2012-10-05 15:38:20 -07:00
fa81f27254
CLOUDSTACK-271: when check for vnet conflicts against existing physical networks, skip the networks with null vnet ranges
2012-10-05 15:10:31 -07:00
be2017849a
CLOUDSTACK-84: fixed NPE that used to happen on API layer when list resource of the project was called when project was going through removal process.
2012-10-05 15:10:31 -07:00
5cd7fb8408
CLOUDSTACK-121: Fixed "Incorrect username/domainId login causes NullPointerException "
2012-10-05 11:42:04 -07:00
15f6fbbee4
CLOUDSTACK-251 :
...
when host is reconnected, CS try to make sure the host can access primary storage,
CS only do this when primary storage is UP, and even host cannot access primary storage,
that is okay, do not throw exception, just print a warning message
2012-10-04 11:31:53 -07:00
4e1f3f9410
CS-16426 For network offerings with IP conserved mode off, LB/PF/StaticNAT rule creation fails if the first rule is firewall
...
fixes, accidental modification of network services map object corresponding to a public IP
2012-10-03 17:18:00 -07:00
89779cceb8
Merge branch 'master' into regions
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/user/UserVO.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/user/AccountManagerImpl.java
setup/db/create-schema.sql
2012-10-03 14:09:01 +05:30
78c08de467
Removed unused imports (that caused a dependency on xapi)
2012-10-02 10:30:26 -07:00
b7a93be47e
Added license header to Upgrade40to41.java
2012-10-02 13:06:59 -04:00
f16b5103d8
Merge some stuff from maven-waf branch into master
2012-10-01 15:04:08 -07:00
93aaa5f975
Provide an (for now) empty upgrade path so the server will start.
2012-10-01 14:07:24 -07:00
aa6355ffe6
Updated master to 4.1.0
...
mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P
client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT
2012-10-01 11:00:55 -07:00
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
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
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
c27b44e7f7
Removed unused imports from snapshot manager
2012-09-27 10:50:48 -07:00
6875f48966
Validate port ranges in PF rule only when startPort != endPort in private or public range
2012-09-27 10:50:30 -07:00
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
4fcf64dd74
updated regions branch with changes from master
2012-09-27 17:04:59 +05:30
39d394a8e8
Propogate Domain and User commands
2012-09-27 16:44:12 +05:30
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
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
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
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
7e75140537
CLOUDSTACK-204 Setting global config 'consoleproxy.service.offering' causes mgmt failed to start
2012-09-26 14:05:37 +08:00
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
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
a01304e65b
CLOUDSTACK-123: fix NPE
2012-09-18 16:43:05 -07:00
955cbd97bc
CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state
2012-09-18 11:18:44 +08:00
387c6fc135
Merge branch 'master' into javelin
2012-09-17 15:31:37 -07:00
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
ff81fda4e0
adding missing import that should have been part of commit b28749f2b1
2012-09-17 13:18:32 +05:30
b28749f2b1
upgrade external devices support from 2.2.14 to network offering framework
2012-09-17 11:39:41 +05:30
db9cc97ab3
Brought over new changes from master
2012-09-13 11:43:22 -07:00
06b7d80fec
latest changes
2012-09-13 11:31:54 -07:00
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
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
5532f58bbc
remove cloud.com license headers
2012-09-13 12:34:32 +08:00
55bcfaf805
CLOUDSTACK-88 Cannot listVM by vpcId which is required by VPC UI
2012-09-13 11:21:11 +08:00
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
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
cd77e42a71
Closing open transactions from SecurityGroupWorkDao
...
reviewed-by : Prachi Damle
2012-09-12 18:48:33 +05:30
2307117a24
Fixed unittest
2012-09-11 17:38:31 -07:00
9445c9e73b
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:38:30 -07:00
331598243c
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:38:29 -07:00
63ab0c2728
Keep the instance-id and vm-id values prior to Acton, use UUID for VMs created poast Acton.
2012-09-11 17:38:28 -07:00
1c96ef41c1
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 17:38:27 -07:00
4a8ffe34e2
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 17:38:24 -07:00
2404d3493d
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:38:15 -07:00
452e34908f
Fix the output of instance-id and vm-id to UUID
2012-09-11 17:38:06 -07:00
88f85b29c2
Replace db-id by UUID for user VM's vm-id.
2012-09-11 17:38:05 -07:00
b02551dcf6
Revert "CLOUDSTACK-70: Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails"
...
This reverts commit ecd1ac214c
2012-09-11 17:38:02 -07:00
efd0905fbd
only check ISO which is downloaded status
2012-09-11 17:37:58 -07:00
e5a16f40cd
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-11 17:37:05 -07:00
3afc9cc630
Add KVM to hypervisor types allowed in VPC
...
RB: https://reviews.apache.org/r/6926/
Send-by: Marcus Sorensen
2012-09-11 17:33:24 -07:00
e1b3f0cf87
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-11 17:33:00 -07:00
4e29e0d5c3
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-11 17:32:59 -07:00
c876a66b3f
Fixed unittest
2012-09-11 17:26:20 -07:00
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
d0c526fdcd
Replaced tabs with spaces in VirtualNetworkApplianceManagerImpl (tabs were used mostly in network stats related code)
2012-09-11 17:03:11 -07:00
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
cc80d09d77
CS-14796: Error out with InvalidParameterValueException in UserVmManagerImpl if userdata is not base64 encoded.
2012-09-11 16:58:09 -07:00
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
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
4b8fb79ef6
Fix the output of instance-id and vm-id to UUID
2012-09-10 18:02:34 -07:00
663e250334
Replace db-id by UUID for user VM's vm-id.
2012-09-10 18:01:08 -07:00
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
0442917381
only check ISO which is downloaded status
2012-09-10 13:30:25 -07:00
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
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
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
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
1d0a10c69e
Merged master over to javelin to get new poms and maven build
2012-09-05 14:31:24 -07:00
86427559cb
CS-16269: Fix savePassword on one stopped RvR
2012-09-05 13:46:44 -07:00
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
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
dd07d1598f
Fix Bug CloudStack-9 can not change OS preference from OS to none
2012-09-04 20:51:03 +08:00
73cc474157
add secondary storage provider
2012-09-02 19:26:20 -07:00
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
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
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
2fd99fe955
Deleted files
2012-08-30 09:59:27 -07:00
6309253de1
Deleted some useless files
2012-08-30 09:59:25 -07:00
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
f7acd8fed8
Create random version for StartupCommands in dev env setup
2012-08-30 08:47:02 +02:00
79ebffe4f3
CS-13594: Download template is unable to handle multiple SSVMs per zone
...
Reviewed-by: Kishan
2012-08-29 15:25:00 +05:30
eb4a3cf6c8
bug CS-15398: fix for basic zone dns issue in multiple pods
2012-08-29 14:33:27 +05:30
2300310243
Messaging facility initials for new architecture
2012-08-28 17:58:45 -07:00
f6f1be62b9
configuring tomcat maven plugin too
2012-08-28 23:58:06 +02:00
f218003607
Merge branch 'maven-final' of git://github.com/ibuildthecloud/incubator-cloudstack
2012-08-28 23:30:57 +02:00
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
ff7c964a66
Add ability to do jetty:run in eclipse
2012-08-28 09:16:44 -07:00
43e4de429e
Fix up some dependencies
2012-08-28 09:03:25 -07:00
5e0ede8bd9
bug 13946: reducing poll interval
2012-08-28 12:22:46 +05:30
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
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
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
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
3609e44b58
commit for https://reviews.apache.org/r/6608/
2012-08-27 10:39:49 -07:00
93ac01db0b
Fixed unittest
2012-08-27 09:46:56 -07:00
a06ed5728c
remove intermediate parent poms
2012-08-27 16:43:24 +02:00
3aa469da2a
groupdId is now org.apache.cloudstack
2012-08-25 09:20:21 +02:00
0d9b81aac6
that was an unused import not a missing dependency
2012-08-25 00:44:14 +02:00
e7b4e15b42
add missing dependency
2012-08-25 00:37:25 +02:00
5ef60aceb1
%s/tab/ws/
2012-08-25 00:03:23 +02:00
4a4007e652
Add license
2012-08-24 11:18:54 -07:00
ebc0fa458a
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-24 11:18:54 -07:00
490e87a617
Fix small compilation issue encountered when building with maven
2012-08-24 11:18:53 -07:00
f826971fea
Maven config, initial commit
2012-08-24 11:18:52 -07:00
e3f2cf908a
Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor
2012-08-24 15:57:18 +02:00
4ea36b82e9
propogate account changes to other Regions
2012-08-24 15:59:59 +05:30
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
d06d6dae72
add maven eclipse project files from Darren
2012-08-23 17:55:20 -07:00
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
9a51ff3bfc
Maven worksplace fixes/patches from Darren
2012-08-23 14:26:27 -07:00
2f6cc4b0cb
Add license
2012-08-23 14:26:26 -07:00
ad54ed1790
* Maven 3 support
...
* Pretty Format POM's
* AWS API compiles now
2012-08-23 14:26:26 -07:00
f78aa9d98a
Fix small compilation issue encountered when building with maven
2012-08-23 14:26:25 -07:00
b8e95e435f
Maven config, initial commit
2012-08-23 14:26:25 -07:00
3298a481a8
For assignVM, marking older snapshots removed in db
2012-08-23 12:22:02 +05:30
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
3ada5e4a46
VPC: CS-16100 - 1) when start VPC router, never pick up any other hypervisor besides vmWare and Xen 2) When start user vm in vpc network, throw an error when deploy from the tempalate of not supported hypervisor
...
Reviewed-by: Frank Zhang
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2012-08-22 11:53:59 -07:00
4a2796d7c7
CS-16123: applied the patch from https://reviews.apache.org/r/6723/
...
original committer: Mice Xia
2012-08-22 09:39:19 -07:00
a5248f1cfc
Fix for dns issue in multiple pods
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-22 16:48:41 +05:30
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
0b31a0af62
[ASFCS40]304 -> 305 DB upgrade merge to 302-> 4.0
2012-08-21 16:27:57 -07:00
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
cd0004bb86
CS-16111 - DB upgrade; fixed foreign keys names
2012-08-21 15:38:17 -07:00
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
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
7d0ad98c93
More logging to lock operations on the network
2012-08-21 15:25:17 -07:00
14dd3f07d7
Fixed line endings in VirtualNetworkApplianceManagerImpl
2012-08-21 15:24:44 -07:00
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
481aae1ebc
add recreate.systemvm.enabled parameter to control recreating systemvm
2012-08-20 11:19:26 -07:00
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
86d49e7aa0
CS-16060: Firewall service should be excluded from conserve mode checking
2012-08-17 17:05:04 -07:00
a8efbcda58
S2S VPN: Fix license headers
2012-08-17 16:52:06 -07:00
1cfcefd2fb
CS-16043: Using network based router rather than account for RVR detection
2012-08-17 16:52:06 -07:00
ea6f3eb6f9
CS-14253: Apply IP when firewall rule is in place
2012-08-17 16:52:06 -07:00
4cb7a100c6
Revert "bug 14484: Apply existed firewall rules when associating IP"
...
This reverts commit b409615a32
2012-08-17 16:52:06 -07:00
9059740dc1
HA worker thread needs to have its own worker thread configuration
2012-08-17 12:59:52 -07:00
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
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
98ae204972
giving diff ip to VR
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2012-08-17 13:49:39 +05:30
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
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
5b85edb961
bug CS-16034 getRandomIp can return -1 unexpectedly
...
also fixes unit test failures
2012-08-16 11:42:25 -07:00
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
0bf6de3eb2
CS-16030: set UUID when persist public ip address
2012-08-16 10:13:39 -07:00
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
7e093a949d
CS-15823 Failed snapshot should be marked as Error and cleanup asynchronously
2012-08-15 11:06:25 +08:00
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
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
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
04bf1a33c6
apply patch https://reviews.apache.org/r/6572/
2012-08-13 17:28:41 -07:00
b3760350fe
VPC: CS-15805 - guest cidr should be RFC1918 complient
2012-08-13 17:17:06 -07:00
7120ce0717
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2)
2012-08-13 16:50:06 -07:00
62526a715a
Fixed unitest
2012-08-13 16:20:09 -07:00
4433c5a51a
Database upgrade from 302 to 40
2012-08-13 16:20:09 -07:00
71ead9ef4e
VPC: CS-15925 - when vpc provider is speficied for a new network offering, no other providers can be used
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-13 14:03:39 -07:00
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
ce12d0d70d
Submit Midokura SDN controller stubs
2012-08-13 18:55:11 +05:30
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
42fbf24f86
Remove @author tag from non third-party source files in server folder
2012-08-13 15:17:31 +08:00
822cf3c9ee
VPC : typo in FirewallRuleVO
2012-08-12 10:55:21 -07:00
32f55f3e3c
Merge branch 'master' into vpc
2012-08-12 10:22:54 -07:00
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
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
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
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
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
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
a4431b5740
S2S VPN: Use coma instead of semicolon for separating cidr list
2012-08-10 16:20:52 -07:00
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
ccac505944
Merge branch 'master' into vpc
2012-08-10 10:47:49 -07:00
5c349dd5e5
Fixed NetworkManagerImpl - tabs weren't replaced with spaces in some places
2012-08-10 10:45:38 -07:00
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
bd2a130251
fix unittest SecurityGroupManagerImpl2Test
2012-08-10 16:01:43 +08:00
6cddd1e767
Removed trailing whitespaces and fixed line endings in some files
2012-08-09 23:30:33 -07:00
3cf13c8b7c
Fixed unittest
...
Conflicts:
server/test/com/cloud/vpc/VpcApiUnitTest.java
2012-08-08 19:00:08 -07:00
c5e3493792
Merge branch 'master' into vpc
2012-08-08 18:38:35 -07:00
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
057d6ccbb8
Name change for vpc/Dao package (dao is lowercased now)
2012-08-08 14:51:51 -07:00
457f3b3dc9
Removed all javax source code from utils package
2012-08-08 12:58:22 -07:00
a5f99a2ca0
VPC: set event details in the method called by API
2012-08-08 11:52:46 -07:00
048c5e50cf
Merge branch 'master' into vpc
...
Conflicts:
utils/test/com/cloud/utils/component/MockComponentLocator.java
2012-08-08 11:50:39 -07:00
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
a74c6e3104
fix CS-15814 Description of global configuration 'encode.api.response' is incorrect
2012-08-08 16:29:53 +08:00
2641b5d6b8
S2S VPN: Fix multiply remote side guest networks
2012-08-07 18:39:45 -07:00
c1c952b42b
should have used non url safe
2012-08-07 16:58:16 -07:00
5e0eb93fe6
S2S VPN: CS-15882: Only allow VPN connection between same account's gateways
2012-08-07 16:27:04 -07:00
a6a864a1a8
Removed Base64 file and use the apache version
2012-08-07 15:41:54 -07:00
46a12b378c
CS-15243: Add service combination check at create network offering
2012-08-07 13:17:48 -07:00
95449da4be
Merge branch 'master' into vpc
2012-08-07 11:37:45 -07:00
bda1e2d08d
VPC: more unittests for VpcService
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:37:36 -07:00
d38e9eebed
VPC: CS-15850 - don't unplug the nic for public network when there are existing ips in the same vlan having network rules
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:25:02 -07:00
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
cf64fda5d5
VPC: unittest preparation
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-07 11:23:52 -07:00
972fe01aec
VPC: more validation for static route rules: 1) Can't belong to guest cidr defined on Vpc 2) Can't belong to link local cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-07 11:21:53 -07:00
81ff7a09fd
CS-15875 resolved via patch from Andy Gross.
2012-08-07 14:10:11 -04:00
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
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
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
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
1b5103c501
S2S VPN: CS-15472: Separate IKE lifetime and ESP lifetime
2012-08-06 15:19:26 -07:00
5a72044dc7
Merge branch 'master' into vpc
2012-08-03 14:30:54 -07:00
237d91d4c9
Removed @author tags in some classes
2012-08-03 14:25:17 -07:00
3496a73878
VPC: CS-15812 - fixed listVPCs by projectId
2012-08-03 14:23:56 -07:00
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
6eba8a818a
VPC: applyStaticRoutes - don't exclude static routes in Revoke state
2012-08-03 14:15:50 -07:00
78764c8b6e
License header updates for the server folder.
2012-08-03 09:41:27 -04:00
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
0e0b75a041
Merge branch 'master' into vpc
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
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
d6df2fdc64
VPC: createPrivateGateway - added cleanup part happening in case when the gateway fails to be applied on the backend
...
Conflicts:
api/src/com/cloud/api/commands/CreatePrivateGatewayCmd.java
api/src/com/cloud/api/response/AsyncJobResponse.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-02 18:12:19 -07:00
0588c9748c
VPC: CS-15818 - don't allow having ICMP networkACLs with the same cidr and icmpType=-1 for rule1 and icmpType!=-1 for rule 2 as the rule1 covers rule2 in this case
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
utils/src/com/cloud/utils/net/NetUtils.java
2012-08-02 18:09:10 -07:00
39485a4a56
VPC: CS-15821 - corrected mac address format for vpc private network
2012-08-02 18:07:15 -07:00
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
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
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
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
ce9f1afa78
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-08-01 19:04:28 -07:00
21e8fb372b
VPC: CS-15805 - verify vpc guest network cidr only against networks in the same vpc
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 19:02:43 -07:00
a4c52d41e8
VPC: CS-15811 - removed Netscaler from the list of supported providers in VPC
2012-08-01 18:57:52 -07:00
b92d2336ad
VPC: CS-15798 - added vpc resource limit. Check vpc functional spec for more details:
...
http://wiki.cloudstack.org/display/RelOps/Inter-VLAN+Routing+functional+spec
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
2012-08-01 18:57:33 -07:00
5cbe3d9722
ResourceTags: resourcetags support for Project/Vpc/NetworkACL/StaticRoute
...
Conflicts:
api/src/com/cloud/api/commands/ListVPCsCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/src/com/cloud/projects/dao/ProjectDaoImpl.java
server/src/com/cloud/uuididentity/dao/IdentityDao.java
2012-08-01 18:54:08 -07:00
d2df3e0102
VPC: CS-15791 - allow having the same NetworkACL for 2 different protocols
2012-08-01 18:48:21 -07:00
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
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
7cceaae912
VPC: moved vpc related code from NetworkManager to VpcManager
...
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-08-01 18:45:06 -07:00
ebe53a91d7
VPC: reduced visability for some vpc related methods
...
Conflicts:
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-08-01 18:33:12 -07:00
70713043cf
VPC: CS-15774 - VPC and guest networks of VPC should belong to the same zone
2012-08-01 18:20:43 -07:00
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
e0c85c0d41
VPC: replaced vmTo object with vmName parameter in plug/unplugNic commands
2012-08-01 18:19:03 -07:00
904ef73398
Build fix.
2012-08-01 16:41:38 -07:00
96ac18d8ed
S2S VPN: CS-15810: Add check for customer gateway subnets / VPC CIDR overlap
2012-08-01 15:31:17 -07:00
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
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
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
9a9c96df64
Patch fixes file names and imports wherever used, in files introduced in
...
73be77a4c1https://reviews.apache.org/r/6239/
Send-by: rohit.yadav@citrix.com
2012-07-31 10:38:11 -07:00
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
73be77a4c1
add missing files
2012-07-30 16:00:45 -07:00
67941f818d
S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API
2012-07-30 15:52:23 -07:00
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
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
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
9ec89b9240
Allow EIP/ELB network creation only in Basic zone
2012-07-30 13:39:42 -07:00
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
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
7026822e20
Fixed unittest build failure
2012-07-30 15:15:47 +05:30
e87147de2e
fixed build failure
2012-07-30 13:55:12 +05:30
3313cc4a86
rrq 5834: fix for broken attachVolume command
2012-07-30 08:38:50 +02:00
2943dc22d7
CS-15717: fail to delete the network when corresponding network elements fail to be destroyed
2012-07-27 23:37:46 -04:00
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
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
b410cbff5f
CS-15730: Prohibit create VPN connection from different gateway to same customer gateway
2012-07-27 17:41:47 -07:00
3c90fc842f
CS-15704: Fix wrong domain id setting of non-root domain
2012-07-27 16:28:06 -07:00
fd9ef34a0f
CS-15719: Fix state change when stopping
2012-07-27 16:28:06 -07:00
8eee8f342e
S2S VPN: CS-15650: Add connection status update to s2s vpn
2012-07-27 16:28:06 -07:00
786d5995df
S2S VPN: Add list function for normal users
2012-07-27 16:27:36 -07:00
736c4c1510
CS-15670: Allow normal users to configure S2S VPN
2012-07-27 16:27:36 -07:00
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
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
807a9ed2c3
VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks)
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:56:25 -07:00
190329286c
VPC:
...
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-27 13:55:39 -07:00
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
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
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
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
6d15ba85d3
Removed Citrix license header.
2012-07-26 23:04:18 -04:00
7d406bf3d1
Added missing action events for enable/disable static nat
2012-07-26 15:28:50 -07:00
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
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
522bdf8163
S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd
2012-07-25 19:27:16 -07:00
58a9b94dfb
Fixed listNetworks by domainId/aclType=Domain
2012-07-25 14:50:56 -07:00
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
6420ecbd6f
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-07-24 16:13:06 -07:00
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
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
a00456bc57
CS-15676: Fix NPE when stop non-VPC router
2012-07-24 11:43:30 -07:00
c99b1d104a
Fixed broken unittest
2012-07-24 10:30:39 -07:00
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
6cb10ce993
S2S VPN: Add check for router status before apply vpn
2012-07-23 19:53:39 -07:00
766b7a2706
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-23 16:38:58 -07:00
46cd99f01e
VPC: CS-15668 - IpAssoc: unplug the nics before pluggning new ones
2012-07-23 16:38:14 -07:00
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
b18d90af04
CS-15615: Fix Site2SiteVpnService injection
2012-07-23 14:46:17 -07:00
c357134330
CS-15574: Delete VPN gateway and connection when deleting VPC
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:45:42 -07:00
7d68e33323
S2S VPN: Use source NAT ip address for VPN gateway
...
Conflicts:
api/src/com/cloud/api/commands/CreateVpnGatewayCmd.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-23 14:44:05 -07:00
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
230ce1dfee
S2S VPN: Add state for vpn connection response
2012-07-23 14:38:06 -07:00
df9315ff02
CS-15447: Don't enable s2s vpn when provider is disabled
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManager.java
2012-07-23 14:37:40 -07:00
0dec6ea804
CS-15456: Prohibit creating more than one VPN gateway of VPC
2012-07-23 14:35:52 -07:00
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
196885e378
cloudstack 3.0 API - listVpnConnections API - add publicip property (get it from vpnGateway object).
2012-07-23 14:20:43 -07:00
8fad593ac5
cloudstack 3.0 API: CreateVpnCustomerGateway API, ListVpnCustomerGateways API: set object name for API response.
2012-07-23 12:14:59 -07:00
aac0a808c1
cloudstack 3.0 API - CreateVpnConnection API, ListVpnConnections API: set object name for API response.
2012-07-23 12:10:29 -07:00
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
7cf7002571
Merge branch 'master' into vpc
2012-07-23 10:57:55 -07:00
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
c8f72c9198
Merge branch 'master' into vpc
...
Conflicts:
ui/scripts/network.js
2012-07-23 10:36:25 -07:00
65551cff82
Resource tags: CS-15647 - delete resource tags when SG is expunged
2012-07-23 10:33:59 -07:00
394f55d9e3
More logging to the VirtualRouter manager
2012-07-20 17:12:34 -07:00
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
cf895d34d2
CS-15622: always get router info from the DB
2012-07-20 17:12:34 -07:00
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
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
8712812ca7
cloudstack 3.0 API: CreateVpnGateway API, ListVpnGateways API: set object name for API response.
2012-07-20 16:49:17 -07:00
9b4c578e0d
More logging on nic release
2012-07-20 16:44:24 -07:00
308cb36066
Unnecessary INFO log cluttering up the logs. Also make logs more informative
2012-07-19 16:35:45 -07:00
8e648e4a98
Fixed update endpointe.url global config var
2012-07-18 15:47:37 -07:00
281b23c2cd
Fixed license headers
2012-07-18 14:52:13 -07:00
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
6ad2388c72
VPC: added one more default network offering for VPC - the one not having LB service
2012-07-17 17:46:17 -07:00
519c4929bf
VPC: fixed listPublicIpAddresses for the addresses with NULL network_id
2012-07-17 17:12:00 -07:00
d51719ddc3
Fixed unittest
2012-07-17 15:50:56 -07:00
7c2b123d94
Merge branch 'master' into vpc
2012-07-16 15:43:16 -07:00
097c260690
Resource tags: CS-15591 - delete tags for template/iso when corresponding vo object is removed
2012-07-16 15:43:06 -07:00
47615a26b6
VPC: CS-15583 - hostName for the vm should be unique inside the network domain
2012-07-16 15:42:47 -07:00
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
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
829acf6e27
CS-15551 : if 'xen.check.hvm' is false, don't check template hvm in allocator
2012-07-13 16:45:57 -07:00
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
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
4dd71cb635
VPC: CS-15562 - get info about VR's guest networks from nics table
2012-07-13 13:35:18 -07:00
534e6d4d80
VPC: CS-15564 - when send the rules to the backend, form the list of rules after the rules were marked with Revoke state
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
2012-07-13 13:35:06 -07:00
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
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
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
b475396438
VPC: CS-15550 - fixed listVPCs by cidr
...
Conflicts:
server/src/com/cloud/network/vpc/VpcManagerImpl.java
2012-07-13 13:26:59 -07:00
eb52f4a610
VPC: mark gateway with Deleting state when all static routes are gone
2012-07-13 13:26:04 -07:00
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
b15c2576a7
VPC: fixed listStaticRoutes when search by gatewayId
2012-07-13 13:25:47 -07:00
a848ecae8b
VPC: fixed logging
2012-07-13 13:25:39 -07:00
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
79c7da07ab
Phase 1 of Nicira integration
2012-07-11 17:16:06 -07:00
8b7b838c8a
CS-15544: recreate router if router filesystem is crashed
2012-07-11 16:14:28 -07:00
ef8208af00
Merge branch 'master' into vpc
2012-07-11 13:18:51 -07:00
ab2669b01d
CS-15459: fixed listTags by resourceType
2012-07-11 12:08:34 -07:00
7cb4ab5e60
VPC: added State to vpc_gateways
2012-07-11 12:05:42 -07:00
d2e491a377
VPC: don't send staticRoutes in Revoke state to the VPC VR
2012-07-11 12:05:33 -07:00
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
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
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
ade3ae4e3c
CS-15512: Fix delete vpn connection
2012-07-10 14:47:50 -07:00
c2f9417de4
VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method
2012-07-10 14:35:50 -07:00
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
911ed25fbc
Merge branch 'master' into vpc
2012-07-09 18:31:28 -07:00
c2134b431f
VPC: CS-15505 - allocate guest nics when new VR starts in VPC
2012-07-09 18:30:58 -07:00
525ba472e8
VPC: CS-15481: don't allow creating networkACLs for overlapping cidrs/ports
2012-07-09 18:23:58 -07:00
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
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
d52c6e2313
listPublicIpAddresses api: don't set associatedWithNetworkId if corresponding field is null in the DB
2012-07-09 18:13:32 -07:00
10dcc117c3
VPC: CS-15486 - prepare public nic as a part of VR deployment
2012-07-09 18:12:54 -07:00
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
84cdf2c28d
CS-15459: fixed listTags by resourceType
2012-07-09 14:59:58 -07:00
a6086dc806
Removed @author tag from bunch of resources
2012-07-06 17:25:36 -07:00
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
5be0a3eeb1
VPC: fixed listNetworkACLs by networkId
...
Conflicts:
api/src/com/cloud/api/commands/ListNetworkACLsCmd.java
2012-07-06 16:43:39 -07:00
c9eb0c59bf
VPC: allow adding private gateway to the VPC when the VR is in Stopped state
2012-07-06 15:28:07 -07:00
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
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
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
ec26e836fc
CS-15459: fixed listTags for userVms
2012-07-06 11:43:31 -07:00
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
7044fa695d
VPC: CS-15469: createNetworkACL - startPort is not accepted if protocol is ICMP
2012-07-06 11:11:36 -07:00
e1fe1616d7
VPC: fixed CS-15465 - lb creation for ip not associated with any networks
2012-07-06 11:09:56 -07:00
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
b13acc6459
VPC: don't allow vm to be a part of more than one VPC
2012-07-06 11:09:06 -07:00
d6774e6a86
VPC: don't allow vpcs for the same account with overlapping cidrs
2012-07-06 11:08:58 -07:00
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
234ae447ee
VPC: added field networkacl_service_provided to physical_network_service_providers table
2012-07-06 11:08:39 -07:00
07eb6e3cf7
VPC: CS-15447 - fail vpc creation when vpc provider is not enabled at least in one physical network in the target zone
2012-07-06 11:08:28 -07:00
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
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
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
470cd120d1
Added ASF license
2012-07-05 12:28:15 -07:00
27e9cdbece
add console proxy support for devcloud
2012-07-03 23:38:39 -07:00
31f9d718fb
Merge branch 'master' into vpc
...
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2012-07-03 17:32:50 -07:00
f2078afbd8
VPC: added zoneName to the VPC api response
2012-07-03 17:28:20 -07:00
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
023c2e4f59
Encrypting password values that are stored in the cluster_details table
2012-07-03 17:27:21 -07:00
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
21d87f3fa5
VPC: fixed response tag for VpcRespnse
2012-07-03 17:23:50 -07:00
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
2b799aa9ac
VPC: added missing FirewallService to the VR provider
2012-07-03 17:22:41 -07:00
b5563e832e
Add Region APIs
2012-07-03 13:06:21 -07:00
6a1b0f3ecf
Add Region APIs
2012-07-03 13:05:19 -07:00
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
5d5b584a8e
VPC: remove network ACLs from VPC VR when shutdown guest network
2012-07-02 17:44:54 -07:00
40a3482f13
VPC: multiple fixes:
...
* Separate service for NetworkACL - "NetworkACL" service
* allow having just one network supporting LB in the VPC
* perform check against VPC when upgrade network to the new network offering (the same set of checks when you add new network to the VPC)
2012-07-02 17:44:54 -07:00
183633cf70
VPC: createPrivateGateway - consists of plug nic + ipassoc (no setsource nat is needed)
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-07-02 17:44:54 -07:00
b565f63e42
VPC: listPrivateGateways command is available for regular user too (he needs to know the gatewayId for the static route creation)
...
Conflicts:
api/src/com/cloud/api/ResponseGenerator.java
server/src/com/cloud/api/ApiResponseHelper.java
2012-07-02 17:44:28 -07:00
1ee0c30935
VPC: added vpccidr to the list of VPC router bootload args
2012-07-02 17:44:27 -07:00
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
8d16d7f94f
Fix build after merge site to site vpn
2012-07-02 16:39:41 -07:00
5ee4b79688
CS-6840: Fix 0 id returned by createVpnConnection
2012-07-02 16:29:34 -07:00
1d97af3abf
CS-6840: Add status checking for site 2 site VPN
2012-07-02 16:29:23 -07:00
d9688f74ba
CS-6840: List all objects without require parameter
2012-07-02 16:29:10 -07:00
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
0ce1e78364
CS-6840: Add Site2SiteVpnServiceProvider
2012-07-02 16:27:09 -07:00
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
9bb65b1126
CS-6840: Add data structure for site-to-site vpn tables
2012-07-02 16:20:58 -07:00
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
0449ae37f1
CS-15274: Fix NPE on CreateVlanIpRangeCmd()
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2012-07-02 15:05:57 -07:00
9876d34ea4
moving out ELB network element to plugins/network-elements/elastic-loadbalancer
2012-07-02 15:05:58 -07:00
8aa2b55dd6
moving out NetApp code to plugins/file-systems/netapp
2012-07-02 08:34:02 -07:00
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
ae4b66283a
cleaning up some line endings
2012-07-02 09:50:28 -04:00
1a2f354f4d
Remove message about contacting Cloud support.
...
CloudStack has gone Apache now.
2012-07-01 15:12:43 +02:00
1f01d923ca
Merge branch 'master' into vpc
2012-06-28 17:44:08 -07:00
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
c41094154d
moving out OVS code to plugins/network-elements/ovs
2012-06-28 17:23:41 -07:00
377b03acde
VPC: when add guest network to VPC, verify that the list of network services is within the list of services supported by VPC offering
2012-06-28 17:18:27 -07:00
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
c19639e4a2
Static route can be created for generic VpcGateway now, not just Private gateway
2012-06-28 17:17:44 -07:00
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
308fd39a73
VPC: delete network ACLs as a part of network cleanup
2012-06-28 10:18:23 -07:00
b03265bc76
VPC: implemented vpc cleanup thread that cleans up Inactive VPCs (that were failed to delete)
2012-06-28 10:18:14 -07:00
cec5012d5a
VPC: fixed ip addres assignment in createLB rule
2012-06-28 10:18:03 -07:00
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
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
09bd4e1725
VPC: fixed list public ips by vpcId
2012-06-28 10:16:22 -07:00
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
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
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
1a232171eb
VPC: implementation for Add/delete/list StaticRoute. Agent implementation is yet to be done
2012-06-28 10:11:41 -07:00
5f6387e113
add clouddev
2012-06-27 23:28:34 -07:00
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
8197f1f07c
moving out VMWAre and Nexus VSM support code into plugins/hypervisors/vmware
2012-06-26 19:48:55 -07:00
550b22576f
Moving out XenServer support code into plugins/hypervisors/xen
2012-06-26 16:42:31 -07:00
cefbbb3850
moving random storage allocator to plugins/storage-allocators
2012-06-26 15:17:25 -07:00
3ceb8d5667
moving out plaintext authenticator to plugins/user-authenticators
2012-06-26 14:33:27 -07:00
eb5e02e4e1
moving out MD5 authenticator to plugins/user-authenticators
2012-06-26 14:18:42 -07:00
66e14e2627
Applied patch https://reviews.apache.org/r/5522/diff/
2012-06-25 21:19:48 -07:00
ce876e24de
VPC: intermidiate checkin to Static Routes
...
Conflicts:
api/src/com/cloud/api/ApiConstants.java
2012-06-25 21:00:57 -07:00
8be74c033f
VPC: update ip address object after the ip is associated with the network
2012-06-25 21:00:12 -07:00
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
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
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
b770c8b979
VPC: moved NetworkACL manager to the vpc folder
2012-06-25 20:57:50 -07:00
4e7b65ef71
VPC: CS-15354 - fixed updateNetworkServiceProvider for VpcVirtualRouter
2012-06-25 20:57:37 -07:00
dc04e0b2e5
VPC: listPrivateGateways API implementation
2012-06-25 20:57:09 -07:00
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
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
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
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
1a6102be1e
moving LDAP authenticator to plugins/user-authenticators/ldap
2012-06-25 19:30:00 -07:00
974ad65b01
moving out random host allocator to plugins/host-allocators/random/
2012-06-25 18:47:47 -07:00
621f2447bb
Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod
2012-06-25 17:58:45 -07:00
392ae5cb13
moving out Srx code into Plugins/network-elements
2012-06-25 16:55:53 -07:00
422c4ce513
moving out F5 code from server into plugins/network-elements/f5/
2012-06-23 14:16:59 -07:00
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
49b88472a5
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler
2012-06-21 18:57:18 -07:00
ae32736151
Fix compile-tests
2012-06-21 12:25:06 -07:00
887970690b
Added NicTO to SetSourceNat command, CreateLoadBalancerConfigCommand, SetNetworkACLCommand
2012-06-21 10:02:33 -07:00
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
ccec9192a2
VPC: implemented delete and list Network ACL(s)
2012-06-20 17:20:04 -07:00
374a600746
VPC: initial checkin for network ACLs
...
Conflicts:
client/tomcatconf/commands.properties.in
2012-06-20 17:19:49 -07:00
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
d2abc0e275
canUseForDeploy is always false for system networks
2012-06-20 15:45:14 -07:00
55a12582b4
Completed API / Management server code for Resource tags feature. UI is yet to be done
2012-06-20 15:45:08 -07:00
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
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
e2a32ab4f7
Introduced plugins directory.
...
Moved ovm into plugins.
Introduced build.xml for ovm.
2012-06-19 18:27:09 -07:00
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
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
89d7e54732
Network usage for VPC implementation
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2012-06-19 10:08:03 -07:00
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
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
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
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
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
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
38215583ea
Fixed lock problem when add vm to guest network
2012-06-15 14:33:32 -07:00
9ae62d32cd
Isolated non-vpc networks: start router with 3 nics from the very beginning
2012-06-15 14:33:14 -07:00
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
e69561b857
VPC : revert some change
2012-06-15 14:32:47 -07:00
3e5f391c85
VPC: more changes to ipAssoc
2012-06-15 14:32:39 -07:00
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
c82885021b
More logging to plug nic code
2012-06-15 14:27:49 -07:00
aa2b7d2d8c
VPC: fixed guest network shutdown
2012-06-15 14:27:42 -07:00
39422a3138
Release acquired lock for VPC
2012-06-15 14:27:33 -07:00
7e119e4c94
Fixed addDhcpEntry/userdata/password in VPC setup
2012-06-15 14:27:24 -07:00
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
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
973ccdaf4b
VPC : pass netmask once for secondary storage VM
2012-06-15 14:23:51 -07:00
31b8f07bb5
Added NicTO to setupGuestNetworkCommand constructor - we need this info for guest network configuraiton
2012-06-15 14:22:40 -07:00
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
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
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
929997f54e
AssociateIpAddress to VPC - the ip gets associated to the network only when the first rule for the ip gets created.
...
When the last rule is removed for vpc ip, networkId is set to null
Conflicts:
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
api/src/com/cloud/api/commands/EnableStaticNatCmd.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/rules/RulesService.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/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:18:24 -07:00
c56998e876
Support for IPAssoc inside VPC
2012-06-15 14:10:33 -07:00
1189e92708
Destroy VPC if it fails to start during the deployment
2012-06-15 14:10:22 -07:00
9ec8526281
1) Added VPC restart support - new api command RestartVPC. The purpose of the call is to shutdown and start VPC including VPCVirtualRouter restart, rules re-implement, etc
...
2) Only networks created from offerings with conserveMode=false, can participate in VPC
2012-06-15 14:10:09 -07:00
b9a4e79277
1) Added search by vpcId to listRouters/listNetworks Apis
...
2) Don't allow to add new networks/implement existing ones for VPC in Disabled state. Disabled state indicates that there was unsuccessful attempt to remove the VPC, and the further cleanup will be taken care of by cleanup thread.
Conflicts:
server/src/com/cloud/network/dao/IPAddressDao.java
server/src/com/cloud/server/ManagementServerImpl.java
2012-06-15 14:09:37 -07:00
d5507e1379
Support for delete VPC
2012-06-15 14:08:26 -07:00
f28cefc4c3
Added support for network shutdown in VPC guest networks
2012-06-15 14:07:59 -07:00
d9fd7e02a5
Plug nic support
...
Conflicts:
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/storage/secondary/SecondaryStorageManagerImpl.java
2012-06-15 14:07:46 -07:00
f4060c3c1d
1) Added new element - VpcVirtualRouterElement. Extends VirtualRouter + has plug/unplug nics support
...
2) Added services api support for plugging/unplugging the nics to VpcElement
Conflicts:
api/src/com/cloud/network/NetworkService.java
core/src/com/cloud/vm/VMInstanceVO.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-06-15 14:04:09 -07:00
c12ba9c86d
Add type and rpcfilter to the virtual router bootload arguments even when there is no guest network is being configured.
2012-06-15 13:57:27 -07:00
bdfd484444
Deploy VR as a part of VPC: set elementId to the VR element id of the first physical network in the zone by now. TODO - add logic for handling the case when VR has 1 to many element ids relationship
2012-06-15 13:57:11 -07:00
ab680bc30c
Start Virtual Router as a part of VPC start
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2012-06-15 13:57:00 -07:00
9debd3a5df
1) Added start logic to the VPC
...
2) VirtualRouterManagerImpl - refactored deployVirtualRouter method
3) Added vpcId to domain_router/user_ip_address tables and corresponding vo objects
Conflicts:
server/src/com/cloud/network/IPAddressVO.java
2012-06-15 13:56:05 -07:00
afd2d0331f
Set networkId as a join parameter in DomainRouterDaoImpl as networkId was moved to the helper table
2012-06-15 13:55:01 -07:00
998cf66e6c
Removed network_id reference from domain_router table as now VirtualRouter can be associated with multiple networks (VPC case). Code modifications were done accordingly to the places where this field was used.
...
Router->Networks (one to many) are held in router_network_ref table now
2012-06-15 13:54:48 -07:00
60b52f90dd
Initial checkin for VPC feature:
...
1) Added API frameworks for the feature. New commands:
* CreateVPCCmd
* ListVPCsCmd
* DeleteVPCCmd
* UpdateVPCCmd
* CreateVPCOfferingCmd
* UpdateVPCOfferingCmd
* DeleteVPCOfferingCmd
* ListVPCOfferingsCmd
2) New db tables:
* `cloud`.`vpc`
* `cloud`.`vpc_offerings`
* `cloud`.`vpc_offering_service_map`
and corresponding VO/Dao objects.
Added vpc_id field to `cloud.`networks` table - not null when network belongs to VPC
3) New Manager and Service interfaces- VpcManager/VpcService
4) Automatically create new VpcOffering (if doesn't exist) on system start
5) New Action events:
* VPC.CREATE
* VPC.UPDATE
* VPC.DELETE
* VPC.OFFERING.CREATE
* VPC.OFFERING.UPDATE
* VPC.OFFERING.DELETE
Conflicts:
api/src/com/cloud/api/ApiConstants.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/network/NetworkManagerImpl.java
setup/db/create-schema.sql
2012-06-15 13:53:59 -07:00
d0bdab98ae
bug CS-15191: remove a sanity check that prevent us from getting traffic lable under VMware
...
Reviewed-by: anthony
2012-06-06 16:57:49 -07:00
8b6936bde6
CS-15080: VMware control network is CloudStack management network, correct the way to send down a correct traffic label to VMware resource
...
Reviewed-by: Anthony
2012-06-06 16:57:27 -07:00
9298e5d25d
bug 15080: check traffic type in host discovery stage - cluster level checks
2012-06-06 16:54:16 -07:00
d8d4232a7b
bug : CS-15080 - check traffic label at host discovery stage also
2012-06-06 16:53:53 -07:00
7092532ae8
CS-15220: fixed db upgrade for networks using external devices
...
Reviewed-by: Sheng Yang
Conflicts:
server/test/com/cloud/network/MockNetworkManagerImpl.java
Conflicts:
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
2012-06-05 15:10:49 -07:00
79c276ba6b
CS-15116: When GetDomRVersion failed, let VR creation fail
...
Because there are more commands after GetDomRVersion command. Though
GetDomRVersion command itself is not that critical, the commands after it may
including DHCP and firewall related commands. The failure of GetDomRVersion
command would result in the following commands fail to be executed. So it should
fail, and fail loudly.
2012-05-31 18:57:11 -07:00
90b87585e7
CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
...
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
Not sure why but changes in VmwareServerDiscoverer.java were not picked up
when cherry-picking from 3.0.x. Putting them in this separate commit.
2012-05-25 19:50:50 -07:00
4ad8845b28
CS-14956 Support for rate limiting policies in Nexus dvSwith feature for CloudStack
...
Removed global parameters that are not required. Cleanup.
Reviewed-by: Devdeep
2012-05-25 19:41:36 -07:00
7cf04c1fe4
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Incorporating Salvatore's review comments.
2012-05-25 19:02:00 -07:00
daa190b4cb
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Deleting the row in cluster_vsm_map after
a cluster is deleted, if the cluster type
is vmware and the global vswitch nexus
config flag is set to true.
2012-05-25 18:38:30 -07:00
7f26a43d48
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Incorporating more changes from Alena's review.
Modified the Nexus Enable and Disable commands
to return CiscoNexusVSMResponse instead of
SuccessResponse.
Put event annotations for enable/disable functions
that the enable/disable nexus commands cal into.
2012-05-25 18:37:50 -07:00
15d0cf782a
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Removed the vcenter_dc_name and vcenter_ipaddr
fields from the virtual_supervisor_module
table, the CiscoNexusVSMDeviceVO, addClusterCmd,
and all other references to these two fields.
Fixing null pointer exceptions when checking
for nexus related global parameter values in
addClusterCmd.
Conflicts:
api/src/com/cloud/api/commands/AddClusterCmd.java
2012-05-25 18:37:20 -07:00
70fbee2cf2
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Updating the checks for VSM parameter validation while adding cluster.
Conflicts:
server/src/com/cloud/resource/ResourceManagerImpl.java
2012-05-25 18:31:49 -07:00
63de97e63c
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Modifying column names in db tables to
adhere to naming conventions.
2012-05-25 18:28:34 -07:00
6920d76995
CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI.
...
Description:
Missed a check for Null pointer.
2012-05-25 18:28:25 -07:00
82ffddc7b8
CS-15055: DB exception when creating n1kv VSM when adding a cluster via the latest management server GUI.
...
Description:
Adding an optional flag to the addCluster command,
"addvsmflag". If this is set to true, the API will
throw an exception if any VSM parameter is missed
out. The above bug was running into a DB exception
because the vCenter ipaddress wasn't passed in and
the API didn't catch it.
2012-05-25 18:28:10 -07:00
ed0ba1a0e6
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Incorporating more changes post review by Alena.
1. Renamed the ListCiscoVSMDetailsCmd command
to ListCiscoNexusVSMsCmd. The command will
return a list of VSMs always, depending on
what parameter is passed to it. If a clusterId
is passed to it, it will return the VSM
associated to that cluster, if present. If
a zoneId is passed in, it will return a list
of all VSMs configured for any clusters of
type VMware within that zone. If neither is
passed, it will return a list of all VSMs
configured in the management server. If no
VSMs are found, it will return an exception
response.
2. Cleaned up miscellaneous code.
Conflicts:
client/tomcatconf/cisconexusvsm_commands.properties.in
server/src/com/cloud/server/ManagementServerImpl.java
2012-05-25 18:27:29 -07:00
ffaa8cc20a
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
More changes incorporating Alena's review comments:
1. Changed id to clusterId for better naming.
2. Changed the name of GetCiscoVSMByClusterIdCmd
to ListCiscoVSMDetailsCmd.
3. Removed the GetCiscoVSMDetailsCmd command.
4. Removed catch{} blocks in each of the Nexus
related APIs since the exceptions raised in
the API implementations will be caught in the
command dispatcher.
5. Added ActionEvent annotation to
deleteCiscoNexusVSM() function.
6. Modified each Nexus API command's
getEntityOwnerId() to return
Account.ACCOUNT_ID_SYSTEM.
2012-05-25 18:23:51 -07:00
e7246847ac
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Putting in code changes as per Alena's reviews:
Replaced references to CiscoNexusVSMDeviceVO
in GetCiscoVSMByClusterIdCmd to work with an
interface that CiscoNexusVSMDeviceVO instead,
since VO objects should not be directly accessed
in APIs.
Made associated changes in other files.
More commits incorporating Alena's review comments
will follow.
2012-05-25 18:23:40 -07:00
78d40da1bf
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Removing two unexposed APIs that we never use:
ConfigureCiscoNexusVSMCmd
ListCiscoNexusVSMCmd
More changes to follow.
2012-05-25 18:23:21 -07:00
b28568a221
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Modified the following commands to be Async:
a. EnableCiscoNexusVSM
b. DisableCiscoNexusVSM
c. DeleteCiscoNexusVSM
Cleaned up miscellaneous code.
2012-05-25 18:11:04 -07:00
187d32057e
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Didn't stage all modified files in previous
commit by mistake. Checking in the rest of
the changes in this commit. Please refer to
immediate previous commit for CS-9919 for
details on what changes went in with this
commit.
Conflicts:
client/tomcatconf/cisconexusvsm_commands.properties.in
2012-05-25 18:07:48 -07:00
c5aba77927
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Removed the AddCiscoNexusVSMCmd command, and all
references to it. From now on, we shall support
adding a Nexus VSM only when the cluster is being
created. The VSM ipaddress, username, password,
the vCenter DC Name and vCenter Ipaddress that it
serves and connects to respectively can be passed
to the addClusterCmd command optionally. To support
these new parameters, parameters have been added
to the addClusterCmd command.
Added a debug statement in the code that runs checks
when attempting to delete a VSM.
2012-05-25 18:06:59 -07:00
c08716db00
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Added a new API GetCiscoVSMDetailsCmd. This
API gets all details of a VSM when provided
with the VSM ID.
Resolved Conflicts:
client/tomcatconf/cisconexusvsm_commands.properties.in
Conflicts:
client/tomcatconf/cisconexusvsm_commands.properties.in
2012-05-25 18:06:27 -07:00
b793c4c0fe
CS-14929: Exception while creating a port forwarding rule on an acquired ip
...
CS-14943: Unable to deploy VM due to Unable to identify the provider by name CiscoNexus1000vVSM
Description:
Ignore the CiscoNexus1000vVSM provider when checking for
providers when applying port forwarding rules.
2012-05-25 18:04:46 -07:00
49673d772b
CS-14940 VSM access credentials are logged in clear text with Management-server.log
...
Removed debug log after fetching the credentials.
2012-05-25 18:04:33 -07:00
67bfe23d28
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Avoid detection of public traffic label for basic zones. Check switch types along with global parameter for enabling a particular vmware vswitch types. Move credentials information into resource and load during resource configuration. Cleanup.
Conflicts:
server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
2012-05-25 18:00:13 -07:00
c65199cd8c
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Added VSM credentials to AddClusterCmd(optonal params only).
Cleanup.
Conflicts:
api/src/com/cloud/api/commands/AddClusterCmd.java
2012-05-25 17:56:46 -07:00
9709774b4b
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Instance configuration to join distributed vNetwork.
Conflicts:
core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareHelper.java
2012-05-25 17:53:00 -07:00
f774ef7415
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Missed out a file in previous commit when adding
the new API getCiscoVSMByClusterId. Stub file was
added by Sateesh to prevent breakage. Putting the
file in in this commit plus better exception
handling.
2012-05-25 17:45:03 -07:00
75d0f91186
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Added command class GetCiscoVSMByClusterIdCmd.
2012-05-25 17:44:52 -07:00
c59d5415ad
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Portprofile shaping policies will be fetched
from nexus vswitch instead of vcenter.
ACLs and Policies won't be synced to vCenter.
Get physical network label while adding cluster.
Cleanup.
Conflicts:
core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-05-25 17:44:02 -07:00
d933358f10
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Adding command getCiscoVSMByClusterId to
retrieve a VSM associated with a cluster.
2012-05-25 17:41:24 -07:00
b6687faf89
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Retreving physical network configuration from
database. Passing configuration down to resource.
Cleanup.
Conflicts:
core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
2012-05-25 17:40:38 -07:00
7e845cfa62
CS-9919 Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Removed CiscoNexusVSM.java.
2. Put in invocation of Netconfhelper's
connect method to a VSM, in
CiscoNexusVSMDeviceManagerImpl.java.
2012-05-25 17:29:35 -07:00
205f4a2192
CS-9919 - Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Code changes to manage Cisco Nexus 1000v in CloudStack.
VmwareResource has been modified to leverage Nexus vSwitch.
Providing following global configuration parameters,
vmware.use.nexus.vswitch -
This would decide whether Nexus vSwitch in the VMware
cluster environment would be used/managed by CloudStack
for it's network infrastructure needs.
vmware.guest.network.vswitch.type -
This setting would enable CloudStack to use Nexus vSwitch
in the VMware cluster environment for guest traffic.
vmware.private.network.vswitch.type -
This setting would enable CloudStack to use Nexus vSwitch
in the VMware cluster environment for private traffic.
vmware.public.network.vswitch.type -
This setting would enable CloudStack to use Nexus vSwitch
in the VMware cluster environment for private traffic.
Functional Specification -
http://wiki.cloudstack.org/display/RelOps/Cisco+Nexus+1000v+Support+in+CloudStack+-+Functional+Specification
Documentation / README for usage instructions -
http://wiki.cloudstack.org/display/RelOps/Configuration+instructions+for+CloudStack+Deployment+with+Nexus+vSwitch
Conflicts:
core/src/com/cloud/hypervisor/vmware/manager/VmwareManager.java
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
server/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HostMO.java
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
2012-05-25 17:27:00 -07:00
781f0b4966
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Added the PortProfile infrastructure:
a. PortProfileVO : The VO class to represent a db
record of the table port_profile. Each db record
represents one port profile.
b. PortProfileDao: The interface that declares search
functions on the port_profile table.
c. PortProfileDaoImpl: The class that defines the
interfaces declared in PortProfileDao.
d. PortProfileManagerImpl: The class that contains
routines that will add or delete db records from
the port_profile table. If you want to create/delete
a portprofile, call functions from this class.
e. Changes to create-schema.sql to create the port_profile
table.
2. Cleaned up code:
a. Removed a number of unused Dao and Manager objects in
CiscoNexusVSMDeviceManagerImpl.
b. Removed the ListCiscoNexusVSMNetworksCmd command.
c. Removed a bunch of import statements in a few files.
2012-05-25 17:17:56 -07:00
0f28222cce
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Modify addCiscoNexusVSMCmd to enable a VSM
by default, when it is added to a cluster.
2. Put in two new APIs exposed to the user -
a. EnableCiscoNexusVSMCmd
b. DisableCiscoNexusVSMCmd
Disabling a VSM does not delete it. It only
prevents the Management Server from using that
VSM. This is useful if the VSM is in
maintenance mode.
2012-05-25 17:17:37 -07:00
38c140b181
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Put in invocation to the deleteCiscoNexusVSM()
function in the deleteCiscoNexusVSM command
chain.
2. Put in additional check for physical servers
present in a cluster that still is tied to a
VSM. The previous check would query for all
hosts in a cluster, causing the check to see
if a cluster has any physical servers in it
to always fail and thus block the VSM from
getting deleted. By putting in a check to see
if a host if of type "Routing", we refine this
search to only hypervisors.
3. Other miscallaneous code + cleanup.
2012-05-25 17:17:29 -07:00
037ac6592e
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Changed AddCiscoNexusVSMCmd to:
a. Extend BaseCmd instead of BaseAsyncCmd.
b. Take in more required parameters (viz
vCenterDCName and vCenterIpAddress)
1a. Changed DeleteCiscoNexusVSMCmd to also
extend BaseCmd.
2. Put in changes that will ensure that
When a VSM is added, it is disabled by default.
3. Fixed code that was leading to exceptions
related to DB reads/writes to VSM related tables.
4. Added new API Constants in ApiConstants.java.
NOTE - Always initialize new attributes in
ApiConstants.java to values in small case.
Never put in upper case there. Also regardless
of what names you give attributes in the
*Cmd.java's class, you pass in parameters via
API calls by specifying <key>=<value> where the
<key> is taken from the value you specified in
ApiConstants.java.
5. Modified the addCiscoNexusVSM() function in
CiscoNexusVSMDeviceManagerImpl.java to write VSM
records to the db.
2012-05-25 17:17:18 -07:00
ab957b8928
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Fixed type of argument taken by AddCiscoNexusVSMCmd
from ZONE_ID to CLUSTER_ID.
2012-05-25 17:16:38 -07:00
414435c7f3
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
Fixing failure to load ClusterVSMMapDao by
putting in a constructor that takes no
arguments, inClusterVSMMapVO.
2012-05-25 17:10:04 -07:00
7380f52f12
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Missed replacing older table name for VSMs in a few
files (changed the name from
external_virtual_switch_management_devices to
virtual_supervisor_module). Fixed that in this commit.
2. Missed adding the new Dao ClusterVSMMapDao in the Dao
loading in DefaultComponentLibrary. Fixed.
3. Fixed wrong searchbuilder options passed to ipaddrSearch
in CiscoNexusVSMDeviceDaoImpl.
2012-05-25 17:09:41 -07:00
a940d962ca
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
1. Added a new VO class to represent a new table
"cluster_vsm_map". The class is ClusterVSMMapVO
in ClusterVSMMapVO.java. This table has only
two fields - clusterId, VSMId. The clusterId can
occur only once. But the same VSMId can be tied
to different clusterIds.
2. Added the Dao interface + implementation of the
interface. This provides the functions required
to populate objects of type ClusterVSMMapVO with
records from the cluster_vsm_map table. The
interface is defined in ClusterVSMMapDao.java,
and the implementation is in ClusterVSMMapDaoImpl.java.
3. Changed the table name that represents the VSM to
"virtual_supervisor_module" from the earlier overly
generic "external_virtual_switch_management_devices".
4. Added search/remove functions to the Dao of the VSM.
This is the Dao for the Cisco Nexus VSM -
CiscoNexusVSMDeviceDao:CiscoNexusVSMDeviceDaoImpl
--> This is the Dao Implementation that would let
us query/update records on the
"virtual_supervisor_module" table that contains
the records of all the VSMs that are added to
the Management Server.
NOTE::
======
These were some of the changes made as part of the previous commit (#7 ):
1. Renamed CiscoNexusVSMResource.java to CiscoNexusVSM.java.
2. Changed it to not implement a true resource, but to be
just a class providing functionality to talk to a VSM.
3. Modified the AddCiscoNexusVSMCmd class to take in clusterId
instead of zoneId + your fix of the String to Long.
2012-05-25 17:09:26 -07:00
28568e694b
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Description:
This is work in progress. This set of changes will not
compile. Checking in for team wide code sync up.
Changes are underway to test if VMWareResource can be
leveraged to talk to the VSM, instead of creating a
new resource for the VSM, like we've been doing up
until now.
2012-05-25 17:09:08 -07:00
b0facd16e4
Bug CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
At this point, the mgmt server comes up, loading the
Nexus related modules without dying.
Description:
1) Added a new properties file for Cisco N1kv VSM commands:
cisconexusvsm_commands.properties.in
2) Added the CiscoNexusVSMElement to the components.xml file.
3) Modified CiscoNexusVSMElement to implement NetworkElement.
The NetworkElement interface functions are not
relevant to the N1KV VSM, so we override them
with noops.
4) Added an addDao() of CiscoNexusVSMDeviceDaoImpl in populateDaos(),
else we'd run into a failure to look up the VSM's dao when the
mgmt server is starting up:
com.cloud.utils.exception.CloudRuntimeException: Unable to find DAO com.cloud.network.dao.CiscoNexusVSMDeviceDao
5) Also added the CiscoNexusVSMElementService in populateServices(),
and modified CiscoNexusVSMElement to implement Manager as well.
6) populateServices() was running into an exception that indicated
that it was unable to find a commands.properties file for the
cisco n1kv vsm service. Fixed it by changing getProperties() in
CiscoNexusVSMElement to return the correct string
"cisconexusvsm_commands.properties", and putting in an @Override
for getProperties() in CiscoNexusVSMElement. Also fixed up all
the other functions in CiscoNexusVSMElement that needed to have
@Override. Also updated build/developers.xml with this file
location. And did other small cleanup.
7) More clean up in CiscoNexusVSMDeviceManagerImpl.
Conflicts:
server/src/com/cloud/configuration/DefaultComponentLibrary.java
2012-05-25 17:07:03 -07:00
32ba2ef17a
CS-9919: Support for Nexus Swiches (Cisco Vswitches)
...
Reviewed by: Sateesh Chodapuneedi, Devdeep Singh
Description:
This is the first in a series of commits for integrating the
Cloudstack Management Server with the Nexus 1000v Virtual
Supervisor Module.
These changes introduce the necessary API command interfaces
to work with a Cisco N1KV VSM. The backend logic is still to
be put in and will be incorporated in subsequent commits.
Please do not attempt to use these APIs until then. Also,
these are not yet filled in into commands.xml, so they are
not currently exposed.
Additional APIs would be added if required.
These changes will not break any current management server
functionality.
Given below is a description of the changes put in here:
Added Cisco N1KV commands to core/api:
These are the added commands -
AddCiscoNexusVSMCmd
DeleteCiscoNexusVSMCmd
ConfigureCiscoNexusVSMCmd
ListCiscoNexusVSMCmd
ListCiscoNexusVSMNetworksCmd
Added a Network Element service file for Cisco N1KV.
Declared the interface functions that we'll need for
the N1KV VSM.
Defined a DeviceVO file for the Cisco Nexus Element.
Created a response file for Cisco Nexus VSM.
Created new event types for external Switching Management devices.
Put in logic to call interface methods in ListCiscoNexusVSMNetworksCmd
and ListCiscoNexusVSMCmd
NOT VSM RELATED:
Fixed minor typo in some of the event types for external load balancers.
Added properties of a VSM in the VSM VO class.
Replaced the "url" input parameter by "ipaddress"
in the AddCiscoNexusVSMCmd API.
Added a new file - CiscoNexusVSMElement.java to
contain the implementation of the functions
declared in the VSMElementService interface, and
put in implementations of the functions for the
Nexus VSM API commands. These functions are
defined in the CiscoNexusVSMElement class.
Added a class for Port Profiles (PortProfile.java).
The fields in this class are still not correctly
declared as of now. We'll make the required changes
going forward.
Added CiscoNexusVSMDeviceManagerImpl class.
Added CiscoNexusVSMResource class.
Created a new class to provide a package to
connect to Cisco Nexus VSMs. This will be a
set of Java wrapper functions that allow us
to connect/disconnect and send commands and
receive the results of those commands via
XML-RPC. These functions are yet to be
implemented, and will be checked in in future
commits.
Added two new classes, VSMCommand and
VSMResponse, to encapsulate XML-RPCcommands
and responses to and from a Ciscon Nexus VSM.
Put in the following function stubs inside the
CiscoNexusVSMService class:
connectToVSM()
disconnectFromVSM()
executeVSMCommand()
Added new field in the Type enum of the "Host"
interface, for Cisco Nexus VSMs.
Added two parameters to AddCiscoNexusVSMCommand
vsmName
zoneId
Modified the CiscoNexusVSMDeviceVO constructor to
take in an zoneId as a parameter when creating
the VO object.
Added new interface and class for the DeviceDao
implementation for Cisco Nexus VSM devices:
CiscoNexusVSMDeviceDao
CiscoNexusVSMDeviceDaoImpl
Removed the vsmvCenterDomainId property, since it's
going to the same as vsmDomainId, which is the VSM's
switch Domain Id.
Have started putting in the following query functions
in the CiscoNexusVSMDeviceDao interface:
Put in DAO implementations of some of the above functions in the CiscoNexusVSMDeviceDaoImpl class.
Added a vsmName parameter to the CiscoNexusVSMDeviceVO class.
2012-05-25 17:05:15 -07:00
3fd17ae029
Merge awsapi related changes to CloudStack
2012-05-25 14:40:53 -07:00
f1fae9d57f
CS-14753: When Vm is deployed with a Security Group , it also gets associated with the default security group.
...
Changes:
- StartVM needed to be changed to add default security group only when none is present.
- DeployVm: createAdvancedSecurityGroupVirtualMachine changed to follow the same rule - add default SG only if none is specified.
2012-05-25 14:40:31 -07:00
0c1c9141f4
DeployVMCmd: Do not place the instance in default security group if groupId is provided
2012-05-25 14:40:28 -07:00
d646f30e7a
bug CS-15095: vm cpu freq <= host cpu freq
2012-05-25 11:17:55 -07:00
c7bffc7b89
CS-15082: changed search criteria for Running vms in Network. Ip4 Address for guest network can be null for nic in Basic zone when vm originally fails to start.
...
Reviewed-by: Frank
2012-05-25 10:18:43 -07:00
4bb4e98eae
bug CS-14945: Throw an error message if the user is trying to attach the volume in local only storage zone.
...
Reviewed-by: Kishan
2012-05-25 18:46:44 +05:30
f6efcd39a3
CS-15083: fixed source nat ip assoc for the case when account owns more than 1 guest network, and 1+ public account specific ranges
2012-05-24 13:47:14 -07:00
434f166c02
Removed unused comments
2012-05-24 12:04:02 -07:00
e65465929d
CS-15082: don't allow to remove guest network in Basic zone when there are non-expunged CPVM/SSVMs using it.
2012-05-24 11:38:32 -07:00
737543ce3e
CS-15025
...
listTemplates: made executable filters to work for regular user
2012-05-21 15:35:10 -07:00
224bf84f31
CS 14006: log fix
2012-05-21 11:46:04 -07:00
a4b0759c52
bug CS-14862: EIP/ELB - SSVM and CPVM should be given an ip address from the public ip address range.
...
With this fix both SSVM and CPVM will get public IP's in case of basic zone with EIP service.
A static NAT rule is implicitly configured on the EIP service provider to map public IP to a
guest IP address associated with SSVM/CPVM
2012-05-21 20:18:37 +05:30
a4adc25295
bug CS-14945:
...
UploadVolume API is async now with the guidance for all the new apis added in 3.0.x need to be async. Though the success/failure wont be available through the queryAsync job which will report only the initial validation success or failure. The success or failure and the progress will all be available through listVolumes api.
2012-05-21 14:46:17 +05:30
51eeb62f9f
CS-14894: listTemplates - return hypervisor type to everybody
2012-05-18 12:47:06 -07:00
07cbec95fa
bug CS-14957: Return hypervisor type for uploaded volume
2012-05-17 19:22:19 +05:30
a32f675875
CS-14237 GC commands only sent to UP host
...
resolved fixed
2012-05-16 17:21:36 -07:00
e8a5d51da7
Support console access through rebooting with XAPI session re-negotiation
2012-05-16 17:02:22 -07:00
26e78bd0b7
send ssh key to kvm host, even if it's developer env
2012-05-16 14:51:04 -07:00
d2b3ec84e9
CS-13853 secstorage.allowed.internal.sites is not allowed to be 0.0.0.0
...
resolved fixed
2012-05-16 11:57:36 -07:00
2153ce96f7
bug CS-14321: Correcting listVolumes API call to return valid value for isExtractable for ISO derived disk and DATA disk.
2012-05-16 21:47:45 +05:30
bafc3f2a5a
CS-14521
...
Remove CLVM, due to license issue
2012-05-15 15:13:15 -07:00
9fa63cfe61
CS-14609
...
turn on debug log, if zone is not ready to start ssvm/cpvm.
"Zone host is ready, but console proxy template" means system vm template is not in "Downloaded" state on secondary storage
"Primary storage is not ready" means the template is not been downloaded to primary storage, possible reasons: haven't add primary storage, or primary storage download is not finished/failed.
2012-05-15 14:44:48 -07:00
403addc59d
bug CS-14833: if iso is xen/vmware tools, attach it to vm; status CS-14833: resolved fixed
2012-05-15 14:04:16 -07:00
d11dceaccc
CS-14904
...
Fixed the bug where vm_instance.ha_enabled wasn't updated during service offering upgrade
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2012-05-15 12:36:40 -07:00
c01d03e53f
bug CS-14249: cluster.localStorage.capacity.notificationthreshold text is incorrect
2012-05-15 19:58:30 +05:30
7e0863555b
bug CS-14814: Do not allow attaching volume to a stopped vm for an uploaded volume. Make changes to accomodate volume attaching for a vm created in Stopped state.
2012-05-15 18:28:12 +05:30
3b1aca19b3
bug CS-14291: support EIP with multiple NetScalers in basic zone
...
This fix will enable support for multiple NetScaler devices providing EIP service in same zone.
- Introduced global setting "eip.use.multiple.netscalers" to turn multiple netscaler support
- Enhanced configureNetscalerLoadBalancer API to take the PBR setup between the POD's subnet
and NetScaler device
- logic to pick a NetScaler (based on the guest IP and corresponding pod) while configuring INAT rule
2012-05-15 14:00:32 +05:30
910ae7446b
don't call _secMgr.generateSetupCommand each time copying template
...
it will reboot httpd making in processing copy fail
2012-05-14 14:15:30 -07:00
28aaab4031
CS-14873 : Authentication errors
2012-05-14 11:13:39 -07:00
2daf7998c8
CS-14692: don't allow to remove account specific ip range when it has sourceNat ip address, and associated with non-removed Guest network
2012-05-14 10:13:44 -07:00
acd55bac90
bug CS-14785: Allow attaching the volume for Uploaded volume. Also have transition fo delete volume.
2012-05-14 16:46:49 +05:30
4f12a5191a
CS-14783
...
Fixed limit check when acquire public ip range for the account.
2012-05-11 15:40:17 -07:00
e6c764f149
CS-14685: Added customdiskofferingmaxsize to the listCapabilities response
2012-05-11 13:45:31 -07:00
838d01754b
bug CS-14785: Improvements to volumes sync so that it can recover from any error. Introduced new state UploadOp which signifies that the volume os on secondary and the status would be picked up from volume host ref table.
2012-05-11 11:42:42 +05:30
189ac88a11
bug CS-14785: String equality should be through equals function....what was i thinking !!!.
2012-05-08 16:07:52 +05:30
d0a09732d2
Bug 14120: Enabling SNAT for all the public NICs.
...
Summary of changes:
- snat flag is set to true if it is first ip of the NIC.
reviewed-by: Abhi
2012-05-07 10:08:51 +05:30
0d2422720b
bug CS-14739: Check for the volume and vm hypervisor compatibility before attaching the volume to vm in case the volume is on secondary storage.
2012-05-04 17:29:22 +05:30
9fbc81e405
bug CS-14763: Added missing 301 to 302 path for 2.2.10 upgrade
...
status CS-14763: resolved fixed
reviewed-by: Abhi
Conflicts:
server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java
2012-05-04 16:08:01 +05:30
c65d3bdace
bug CS-10789: Some more code to make the Uploav volume more robust.
2012-05-03 10:50:12 +05:30
9097b53eab
bug CS-10789: Put zone id in the volumehost ref table. make list volume to show the percent uploaded.
2012-05-03 10:46:02 +05:30
a794e49545
CS-14724 : Making the default network label configurable, improving exception management
...
Please also see notes added to wiki.cloudstack.org/display/QA/Open+vSwitch+Tunnel+Manager
2012-05-02 15:16:10 +01:00
1ac0ac956b
bug CS-14695: Encrypt VNC password during 3.0.0 upgrade
...
status CS-14695: resolved fixed
reviewed-by: Abhi
2012-05-01 11:10:59 +05:30
2feafb18a0
bug 14694: when select valid clusters, exclude the removed ones
...
status 14694: resolved fixed
2012-04-30 13:10:57 -07:00
03b23d3645
adding a plaintext authenticator
2012-04-30 16:43:40 +05:30
13b927fb25
bug CS-14663: accepting encoded password for MD5
2012-04-28 12:36:48 +05:30
469ed78a58
CS-14606: Restoring config parameter which was accidentally removed
2012-04-27 17:17:49 +01:00
8080bc2d26
CS-14606: Change name for config parameter
2012-04-27 17:17:34 +01:00
5da0fdaecb
CS-14637: db upgrade - fixed inconsistencies in category/component fields for a bunch of global config variables
2012-04-26 10:10:05 -07:00
c7cbae4c48
Set ha host to false when no ha tag is enabled
2012-04-25 11:04:35 -07:00
2bf0c7f7ff
CS-14605: OVS cleanup
...
Fix syntax errors in ConfigurationManager and Resource Manager test
2012-04-25 10:53:41 +01:00
6e0a86862a
CS-14605: OVS Tunnel Manager Clean-up
...
1) Remove old VLAN-in-overlay manager
2) Remove unused DAO objects
3) Fix code using removed object (all stale lines)
2012-04-25 10:50:17 +01:00
afb97f128b
Account specific vlan ranges - fixed deleteVlanRange
...
Conflicts:
api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2012-04-24 17:18:27 -07:00
eaf9d3d820
Catch all exceptions when change engine and row_format - can fail when table is full. Just skip as its not a critical fix
2012-04-24 15:49:28 -07:00
8ccb4b6680
CS-14270: return VLAN id only if the broadcast URI starts with 'vlan'
2012-04-24 21:27:26 +01:00
a678988f33
CS-14622: fixed adding vlan range per account - associate it with the Guest network, not public
...
Conflicts:
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
2012-04-24 11:44:00 -07:00
026ed52f1d
CS-14437: Final changes to ensure proper tunnel creation (rebase problems)
2012-04-24 15:53:10 +01:00
5021274232
CS-14256: throw executionException when finalizeStart fails (no point to retry).
2012-04-23 15:56:23 -07:00
eb36cd5aba
Removing basic connectivity provider and OVS network offering as not
...
needed for Bonita
2012-04-23 22:35:15 +01:00
ccbdee899c
Now finding the IP address also for the remote endpoint
2012-04-23 22:33:19 +01:00
59e93d9f29
Minor changes to string format command
2012-04-23 22:33:19 +01:00
ec472fcaaa
Forgot to add new dao into component library!
2012-04-23 22:33:19 +01:00
b980993864
Adding DB support for interfaces OVS tunnel manager will use as GRE endpoints
2012-04-23 22:33:19 +01:00
Rohit Yadav
Alena Prokharchyk
Prachi Damle
Alex Huang
Hiroaki Kawai
Chip Childers
Edison Su
Edison Su
adefanti
Marcus Sorensen
Vijay Venkatachalam
Deepak Garg
Pranav Saxena
Kelven Yang
Laszlo Hornyak
Satoshi Kobayashi
Kishan Kavala
Dave Cahill
Edison Xu
Joe Brockmeier
Hugo Trippaers
Jessica Wang
Min Chen
Kelven Yang
Mice Xia
Rohit Yadav
Anthony Xu
Murali Reddy
Marcus Sorensen
Sheng Yang
Manikanta Kattamuri
Koushik Das
Saksham Srivastava
Prasanna Santhanam
Fang Wang
Likitha Shetty
Gavin Lee
Darren Shepherd
Nitin Mehta
Jayapal
olivier lamy
Abhinandan Prateek
Darren Shepherd
Darren Shepherd
David Nalley
Chiradeep Vittal
Mice Xia
tomoe@midokura.jp
Edison Su
Sheng Yang
Wido den Hollander
bfederle
Prasanna Santhanam
Deepti Dohare
Vijayendra Bhamidipati
Jason Bausewein
unknown
U-CITRITE\\koushikd
Kelven Yang
Sateesh Chodapuneedi
frank
Naredula Janardhana Reddy
Salvatore Orlando
Abhi
root