83d381f25c
fixing some issues found in unit testing
2013-03-26 12:00:13 +05:30
e601272679
logic to get the NetScaler configured as gslb servce provider in the
...
zone
2013-03-20 00:43:03 +05:30
45110b65dc
Merge branch 'master' into gslb-wip
...
Conflicts:
api/src/org/apache/cloudstack/api/ResponseGenerator.java
api/src/org/apache/cloudstack/region/Region.java
plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
server/src/org/apache/cloudstack/region/RegionVO.java
2013-03-19 17:20:44 +05:30
183b989d30
CLOUDSTACK-664:AWS-Health Check feature: Patch applied cleanly , RAT build is successful
2013-03-18 14:01:15 +05:30
2feda05ecd
CLOUDSTACK-1427: Failed to delete Guestnetwork which has LB with
...
Netscaler
There is no need for getIpDeployer to depend on the fact a NetScaler
device is allocated (network is implemented state) or not-allocated
(network is in shutdown state)
2013-03-13 17:30:15 +05:30
fea98fa66b
Merge branch 'master' into gslb-wip
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/ResponseGenerator.java
client/tomcatconf/commands.properties.in
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/configuration/Config.java
setup/db/create-schema.sql
2013-03-11 14:28:26 +05:30
11a7546f1e
add the ability to add NetScaler device as GSLB provider in a zone
2013-03-11 12:42:51 +05:30
89c33a01e7
-introducing RegionServiceProvider and GslbServiceProvider
...
-NetScaler element implements GslbServiceProvider
2013-03-07 20:05:51 +05:30
54bff978fe
implements changes to 'SiteLoadBalancerConfig' details and
...
implementation of UpdateGlobalLoadBalancerRule command in service layer
2013-03-03 22:55:49 +05:30
368a5d5a9a
Prachi's commit 20a747601c introduced a
...
new call to network.getPhysicalNetworkId() which wasn't mocked yet in
the nvp plugin unittests.(cherry picked from commit aea5b268b4
2013-02-21 14:08:56 +01:00
ec1f48a4b2
CLOUDSTACK-1331: Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan
...
Changes:
-We need to update the physical_network_id for public vlans.
-Physical network ID should be retrieved from the network if present.
2013-02-20 11:23:32 -08:00
80d58b6c73
CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-20 16:42:56 +05:30
e0ded1aa2b
NetScaler server reource code changes to interpret
...
GlobalLoadBalancerConfigCommand and set up appropriate 'gslbvserver',
'gslbsite', 'gslbservice', 'gslb_vserver_service_binding',
gslb_vserver_domain_binding objects on NetScaler device
2013-02-15 18:13:34 +05:30
44e3e5ebe0
add some more stub's
2013-02-08 17:25:01 +05:30
41fc03d4e7
bigswitch-vns: Fix since version in apis, add spring annotation to fix NPE
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-02-08 16:36:24 +05:30
fc0bf21a13
CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl
2013-02-05 16:49:34 +05:30
296c20332d
Merge javelin into master
2013-02-01 14:40:45 -08:00
7b75f0d990
Sync master to javelin one more time
2013-02-01 11:37:33 -08:00
bfc4f982fd
adding missing license in one of the files of BigSwitch
2013-02-01 13:32:13 +05:30
736b236eaf
bigswitch controller support
...
Reviewed-by: Chiradeep Vittal <chiradeepv@gmail.com>
Signed-off-by: Murali Reddy <murali.reddy@citrix.com>
2013-02-01 12:42:04 +05:30
e7a554fc6a
Merging events framework branch into master. This commit will bring
...
following changes
- introduced notion of event bus with publish, subscribe, unsubscribe
semantics
- a plug-in can implement the EventBus abstraction to provide event
bug to CloudStack
- A rabbitMQ based plug-in that can interact with AMQP servers to
provide message broker based event-bug
- stream lines, action events, usage events, alerts publishing in to
convineance classed which are also used to publish corresponding
event on to event bus
- introduced notion of state change event. On a state change, in the
state machine corrsponding to the resource, a state change event is
published on the event bug
- associated a state machined with Snapshot and Network objects
- Virtual Machine, Volume, Snaphost, Network object state changes wil
result in a state change event
2013-02-01 01:37:24 +05:30
1b2b369ecb
Merge latest master into javelin
2013-01-31 11:34:49 -08:00
b6727e5646
CLOUDSTACK-299: Egress firewall rules feature for guest network on VR
2013-01-31 11:20:47 +05:30
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
af4485ae9e
Put nonoss under Spring framework
2013-01-25 15:41:48 -08:00
45a92ba369
Fix the initialization of management server
2013-01-23 15:29:41 -08:00
aa7b3e0f6d
Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
...
Corresponding getter/setter is renamed too.
Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
4fbecf15ec
add unit test back, primary storage life cycle is tested
2013-01-21 17:01:00 -08:00
10d9c019a9
All merge conflicts resolved
2013-01-18 12:14:57 -08:00
070856affd
CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version
...
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-01-18 16:49:52 +05:30
56cd809600
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack
...
Re-merge with network-refactor
2013-01-17 11:32:49 -08:00
3dabd5fbf3
Clean up ApiServer, ApiServlet and ApiDispatcher flow to handle various CloudRuntimeException
...
and CloudException in one place, and Introduced ApiErrorCode to handle CloudStack API error
code to standard Http code mapping.
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-01-16 22:36:34 -08:00
cadca5fc0c
Merge branch 'master' into network-refactor-merge2
...
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
2013-01-16 19:17:14 -08:00
497dcd5044
Get rid of PlugService annotation, replace it with Spring standard injection in command classes
2013-01-16 18:44:44 -08:00
2be270de89
Separate loadable components like Gurus, Elements, Adapters to componentContext.xml
2013-01-16 16:33:59 -08:00
88a0b5ac48
Revert "Summary: partical check-in for L4-L7 network services in the shared"
...
This reverts commit 6657246cd4
2013-01-16 16:05:17 +05:30
bca2c928e8
PluggableService: Fix interface definition
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-14 19:01:26 -08:00
f57dcaa820
Loadable components to be in separted Spring component bundling
2013-01-11 15:33:15 -08:00
1294cdc701
pulled from master
2013-01-10 16:01:01 -08:00
d6f44a4d6a
merged from master
2013-01-10 15:55:42 -08:00
c4e890c55d
PluggableService: Refactor method to return map of key value pairs
...
- Makes plugins self contained so they decide their properties file format
- PluggableService creates the contract that implementing entity will return a
properties map which is apiname:rolemask (both are strings)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-10 15:55:02 -08:00
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
0bcebd33b6
Fix problems after merge
2013-01-09 17:36:53 -08:00
0c3001530f
Network-refactor: move readonly interface NetworkModel into api project so that plugins can stop depending on the server project
...
Network-refactor: accidentally injected NetworkModel twice (revert one of them)
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
504264236c
Network-refactor: In preparation for moving the read-only interface NetworkModel
...
to the api project, ensure that all methods use interfaces from the api project.
By moving it to the api project, it lessens the dependency of plugins on the server components.
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
5a830c4db0
Network-refactor: Refactor NetworkManager into NetworkModel and NetworkManager.
...
NetworkManager's exclusive focus is now
- handling plugins during orchestration, and
- to deal with ip address allocation.
Those classes that used to refer to NetworkManager to get access to the datamodel now refer to NetworkModel
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-01-09 15:49:01 -08:00
999ecb67df
plugins: Import and @Parameter fixes
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 11:23:24 -08:00
066edc1105
plugins: Fix pluggable service getPropertiesFiles() on f5, srx and netscaler
...
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-09 11:21:30 -08:00
b6c56736e5
merge from master
2013-01-09 05:20:36 -08:00
077f47193d
Sync changes: Merge branch 'master' into api_refactoring
...
Conflicts:
plugins/network-elements/dns-notifier/pom.xml
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-08 20:36:17 -08:00
Murali Reddy
Rajesh Battala
Hugo Trippaers
Prachi Damle
Rohit Yadav
Kishan Kavala
Kelven Yang
Kanzhe Jiang
Jayapal
Edison Su
Alex Huang
Koushik Das
Chiradeep Vittal
Min Chen