Prasanna Santhanam
1f1a13448f
simulator: resurrect simulator hypervisor as plugin
...
Multiple fixes:
1. changes to the mvn configuration
a. include simulator to client.war
b. activate simulator by profile
2. templates for simulator
3. developer prefill for simulator
a. Use deplydb-simulator to setup simulator db
4. Inherit components-simulator.xml from components.xml
5. ListVolumesCommand missed for MockStorageManager
6. Include simulator properties into utils/db.properties
TODO:
Secondary storage VMs don't come up because ComponentLocator doesn't
retain a unique set of adapaters by name. Fix this in subsequent
checkin.
2012-12-23 19:28:57 -08:00
Rohit Yadav
a3c2bb7418
Merge branch 'master' into api_refactoring
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 19:12:04 -08:00
Devdeep Singh
8f6fdc3efc
CLOUDSTACK-227: Fix NPE and throw an exception if the network is not found in Xen
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 19:03:03 -08:00
Rohit Yadav
beb2fccf1c
api: Finally get rid of IdentityMapper annotation processing in ApiDispatcher
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:06:36 -08:00
Rohit Yadav
042a8e7681
api: Get rid of method definition in interface, that uses IdentityMapper for getting entity
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:05:53 -08:00
Rohit Yadav
9d3ab8ded7
server: Get rid of db helpers that work with IdentityMapper
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:04:32 -08:00
Rohit Yadav
018b5215e0
api: Annotate apis in various plugins
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 18:03:23 -08:00
Rohit Yadav
1bd47d48ab
api: Annotate some nicira apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:43:42 -08:00
Rohit Yadav
e849d70af1
api: Annotate some juniper-src apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:41:10 -08:00
Rohit Yadav
a4fed07a7e
api: Annotate usage related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:33:30 -08:00
Rohit Yadav
fd784bd2d3
api: Annotate CreatePrivateNetworkCmd
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:28:53 -08:00
Rohit Yadav
f4a407e197
api: Remove IdentityMapper imports on vpn
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:26:16 -08:00
Rohit Yadav
02efffa93e
api: Annotate VPC apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:24:58 -08:00
Rohit Yadav
1931667243
api: Annotate volume api
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:21:43 -08:00
Rohit Yadav
edb42d2cbb
api: Annotate templates apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 17:17:59 -08:00
Rohit Yadav
a5dddb4a83
api: Extend or Implement InternalIdentity's getId method on a lot of VOs and Interfaces
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:52:35 -08:00
Rohit Yadav
a157a4c1eb
api: InternalIdentity interface that provides contract to have getId
...
Adds new interface that would maintain contract that extending Interface
or implementing class will have the getId() method to get Internal Id
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 16:51:11 -08:00
Rohit Yadav
296b49c2f8
Merge branch 'master' into test-merge-api
...
Conflicts:
api/src/com/cloud/agent/api/BackupSnapshotCommand.java
api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/resource/ResourceService.java
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
client/tomcatconf/commands.properties.in
core/src/com/cloud/storage/SnapshotVO.java
pom.xml
server/src/com/cloud/api/ApiDispatcher.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/upgrade/dao/Upgrade40to41.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
setup/db/create-schema.sql
setup/db/db/schema-40to410.sql
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
Rohit Yadav
38225a17f6
api: Annotate template related api
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:56:07 -08:00
Rohit Yadav
0719f21320
api: Annotate ssh apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:49:38 -08:00
Rohit Yadav
66c2c0cbb7
api: Annotate snapshot related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:44:45 -08:00
Rohit Yadav
a0a8a0bb5d
api: Annotate resource apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:33:37 -08:00
Rohit Yadav
4d79909828
api: Remove unused, redundant imports in project
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:29:18 -08:00
Rohit Yadav
07f5e1ac2d
api: Annotate offering apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:26:06 -08:00
Rohit Yadav
b37aca47b9
api: Annotate network apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:22:57 -08:00
Rohit Yadav
06246ae27c
api: Annotate nat apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:08:09 -08:00
Rohit Yadav
8559b4eab8
api: Annotate loadbalancer related cmd and response classes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 03:01:26 -08:00
Rohit Yadav
94e7add7aa
client: Re-add missing license header in client/cloudstack-ui.launch
...
Partially reverts Min's change; e7fa1a86fb
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 02:47:27 -08:00
Rohit Yadav
0e1083ad83
api: Annotate iso related cmd and response classes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 02:41:11 -08:00
Min Chen
503db14127
Add back Identity interface to most VO class to avoid cast error in
...
ApiDispatcher.setupParameter call.
2012-12-22 22:35:09 -08:00
Edison Su
4b2d9f4415
refactor test cases: use testNG instead of junit, as testNG can group test cases and pass parameter to test case
2012-12-22 22:10:39 -08:00
Min Chen
3aad2ba972
Add DB host view into fresh install schema and upgrade schema.
2012-12-22 21:49:51 -08:00
Min Chen
e7fa1a86fb
Create DB views to improve ListHostsCmd performance.
...
Signed-off-by: Min Chen <min.chen@citrix.com>
2012-12-22 21:47:05 -08:00
Rohit Yadav
e5fc513257
api: Annotate guest related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:44:02 -08:00
Rohit Yadav
ced1aabf82
api: Annotate firewall related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:42:05 -08:00
Rohit Yadav
af5eacfc01
api: Annotate autoscale apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 20:28:19 -08:00
Rohit Yadav
575fab9711
api: Annotate account and address apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 19:52:41 -08:00
Rohit Yadav
4e2b30d31d
api: Annotate vpc admin apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 19:09:18 -08:00
Rohit Yadav
6f3c7bf4c7
api: Annotate vm related apis in admin pkg
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:58:01 -08:00
Rohit Yadav
5d8e106602
api: Add method in ApiDispatcher to be reused for both UUID and List<Uuid>
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 18:57:26 -08:00
Rohit Yadav
e9457cb407
api: Annotate Vlan admin apis, fix resource, storagepool, systemvm apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:31:16 -08:00
Rohit Yadav
f3f0962df2
api: Annotate admin apis related to traffic type for usage
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:19:56 -08:00
Rohit Yadav
9a3deaf807
api: Annotate template admin api
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 17:11:32 -08:00
Rohit Yadav
93532ea28c
api: Annotate storage pool related apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:58:12 -08:00
Rohit Yadav
a7e6172d8c
api: Annotate admin.router apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:49:59 -08:00
Rohit Yadav
7e3c0ec002
api: Annotate resource apis
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:18:50 -08:00
Rohit Yadav
97514a0693
api: Annotate offering
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
Rohit Yadav
2140ff55ea
api: Refactor and move VPN related api cmd classes to command.user.vpn
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-22 16:13:37 -08:00
Prasanna Santhanam
f0c3b4c62a
simulator:Using the priority to decide b/w MASTER/BACKUP
...
BootArgs carry router priority for master and backup and simulator will
reuse the priority to decide RvR status. Deprecating the odd/even logic.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-22 14:09:59 -08:00
Prasanna Santhanam
ed25ec0500
simulator: simulator maintenance mode and simulator latency per command
...
Detail:
To induce latency for a command you have to use an API call like so
http://localhost:8096/client/api?command=configureSimulator&zoneid=1&podid=1&name=CheckRouterCommand&value=wait:80 |timeout:0
(This is a hidden API command just for the simulator)
You will see the configuration effected in the mockconfiguration table of
simulator db. You can introduce the latency at runtime without restarting
management server.
mysql> select * from mockconfiguration;
+----+----------------+--------+------------+---------+--------------------+-------------------+
| id | data_center_id | pod_id | cluster_id | host_id | name | values |
+----+----------------+--------+------------+---------+--------------------+-------------------+
| 1 | 1 | 1 | NULL | NULL | CheckRouterCommand | wait:80|timeout:0 |
+----+----------------+--------+------------+---------+--------------------+-------------------+
1 row in set (0.00 sec)
By providing the optional zoneid, podid, clusterid, hostid you can induce the
latency at various levels. This delay will happen before the command is
processed and post-execution return Command's Answer back to management
server.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2012-12-22 13:57:13 -08:00