bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
cd6e6a4d3c
CLOUDSTACK-1762 Fixed assigning network or broadcast ip to nic
2013-12-02 11:05:41 +05:30
36201b9776
Fix issue with sourceCidr not being passed to the VRouter on start.
...
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-11-29 13:20:12 +05:30
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
e4b22d0fca
Replace all tabs, particularly the ones in the comments
2013-11-21 03:39:58 -08:00
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
c29cd9d3c7
CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
...
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot
CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 12:19:31 +05:30
1f7ef652cf
Make com.cloud.network.vpn.RemoteAccessVpnService an extensible type
2013-11-14 15:31:33 -08:00
59453ea6be
remove duplicated scheduled tasks from VpcVirtualNetworkApplianceManagerImpl
...
(cherry picked from commit e444a03819
2013-11-14 19:00:24 +01:00
96b9ebafc0
listRemoteAccessVpns: implemented search by networkId and id
2013-11-13 14:26:15 -08:00
0068da7198
CLOUDSTACK-5142: Guest IP address for F5 is not being selected from the
...
defined IP Range in Shared Network
ensure that for shared network, acuqire guest ip should return IP from
the 'startip'-'endip' range of the network.
2013-11-13 18:21:55 +05:30
07c4aec64b
Newly added VR monitoring service has broken VMware basic network mode.
2013-11-12 23:49:45 -08:00
d905c10214
listFirewallRules - added optional networkId parameter allowing to search for firewall rules by guest network id
2013-11-12 17:17:48 -08:00
268c27b4f2
ListPortFowardingRules: added networkId to the list of optional parameters to list by
2013-11-11 16:17:43 -08:00
fb8c58a3cf
retrieving network might fail if it exists in a different datacentre
2013-11-11 10:32:06 +01:00
fd2e8c9ac4
Redundant Router: Fix priority records in db
2013-11-08 18:27:31 -08:00
333be7de4d
Fix redundant router failed to start
...
ResourceUnavailableException won't be catched by VirtualNetworkApplianceManager
after Alex's refactor, because VirtualMachineManager.start() would cover the
exceptions as well. So changed the calling to advanceStart() instead.
2013-11-08 17:41:47 -08:00
19e9849d86
Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
...
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
0076307863
Squashed merge of Ssl Termination feature
...
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support
This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.
The following are the new API's that this patch adds
uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer
Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
edf04a33c1
remove network limitation of nics on systemvms (cherry picked from commit 0227e0013a)
2013-11-08 09:00:24 +01:00
958312de4c
CLOUDSTACK-5042: fix NPE error as BroadcastUri is NULL in shared network after upgrade from 2.2.14 (Cherry-picked from commit 09e7ab9750)
2013-11-08 09:00:15 +01:00
3f5b8f7063
CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router
2013-11-07 19:49:05 +05:30
831eeeb422
Fix CID 1127031 Inefficient Map iterator
2013-11-07 14:59:43 +01:00
416206595e
CLOUDSTACK-4736 Fixed issue in default service selection
2013-11-07 17:11:03 +05:30
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
a7201a81b2
The VPC offering has the option internaly to specify the compute offering (service offering), expose this via the api.
...
Added a field to the command for serviceOfferingId and changed the internal interface to accept the service offering as parameter
Applied automated code cleanup
2013-11-06 22:13:00 +01:00
b464a20a52
CLOUDSTACK-4736: Monitoring services in VR
2013-11-05 23:39:33 +05:30
f9f196a46a
A plugin for Hyper-V control is available for CloudStack. The plugin implements basic VM control; however, its
...
architecture allows additional functionality to be easily added. Incorporating the plugin in CloudStack will allow
the community to participate in improving the features available with Hyper-V. The plugin uses a Director Connect
Agent architecture described here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Progress
Add ability to pass kvp data via the key cloudstack-vm-userdata
Rearrange code to make it clearer what .NET objects are being used.
Test failures are easier to deal with if test key is not deleted.
Acquire management/pod ip for control ip when VR deploys in HyperV
Fixed deletion on VM's on hyperv host when mgmt server gets restarted due to HA
Implementation for attach iso command. Attaches an iso to a given vm.
2013-11-04 18:48:53 +05:30
3205cd42b5
CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
...
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.
Test case also included.
The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
8871cdc03a
Add support for multiple networks in the 'per account' source nat type setting in external network devices
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-10-30 10:16:00 -07:00
089026f6af
CLOUDSTACK-4984: decrement MAX_VXLAN_VNI to be aligned with Linux kernel
...
Linux vxlan interface doesn't accept VNI:16777215 now.
Signed-off-by: Toshiaki Hatano <haeena@haeena.net>
2013-10-31 00:13:54 +09:00
4a9f05bda0
CLOUDSTACK-4967
...
1) vxlan will use bridge scheme 'brvx-<vni>'. Multiple physical networks can host guest
traffic type with vxlan isolation, so long as they don't use the same VNI range.
2) Guest traffic labels can be physical interface if bridge by given name is not found.
Normally we take traffic label name, find the matching bridge, then resolve that to a
physical interface. Then we create guest bridges on that interface. Now we can just
specify the interface.
2013-10-29 15:34:39 -06:00
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -07:00
271a7dff9e
Fix VPC issue due to VpcVirtualNetworkApplianceManagerImpl.java is not registered
...
It should be registered rather than VirtualNetworkApplianceManageImpl.java,
since it would cover the isolated network case as well.
2013-10-28 17:55:51 -07:00
a77435dab5
Add missing extensible type registries
...
The following types were not setup to discover extensions
com.cloud.network.element.FirewallServiceProvider
com.cloud.network.element.PortForwardingServiceProvider
com.cloud.network.element.StaticNatServiceProvider
com.cloud.network.element.NetworkACLServiceProvider
com.cloud.network.element.LoadBalancingServiceProvider
com.cloud.network.element.Site2SiteVpnServiceProvider
2013-10-24 20:20:55 -07:00
1528725949
CLOUDSTACK-754: Enable Remote Access VPN for VPC
...
With integration smoke test case.
2013-10-24 17:34:41 -07:00
2bb716efd8
ResourceMetaData (Resource details) fixes:
...
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
e3280bdba2
Merge remote-tracking branch 'origin/spring-modularization'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
client/tomcatconf/nonossComponentContext.xml.in
client/tomcatconf/simulatorComponentContext.xml.in
framework/db/src/com/cloud/utils/db/Transaction.java
plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
edeaf98117
Cleaner and more type safe Transaction API for checked exceptions
2013-10-23 10:02:43 -07:00
c0c46268ac
CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled
2013-10-22 12:44:23 +02:00
85dc65c7f7
CLOUDSTACK-4786: Reset Redundant Router priority after all the routers are stopped
...
This patch would reset the priority in such condition:
1. All redundant routers are stopped, e.g. due to network GC
2. User start one VM in the network
3. The routers would be brought up with reseted priority(100 & 99).
This would resolve the issue of network GC result in lower limit of redundant router priority reached.
2013-10-17 20:00:48 -07:00
c3df348264
CLOUDSTACK-4836: Fix VPN user are not programmed after restart network
...
Also refactor VPN code.
2013-10-17 17:55:52 -07:00
ab124a17fa
Remove Network Parameter for VPN service provider
...
It's unnecessary since RemoteAccessVpnVO already have network ID binding with it.
2013-10-17 17:55:47 -07:00
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
df3b099449
CLOUDSTACK-4717: associate IP does not work on shared networks with out
...
source nat service
relax the restriction that the source nat service should be avaiable in
the network inorder to associate a public ip to the network
2013-10-16 18:46:37 +05:30
68952514ce
CLOUDSTACK-4862:Admin cannot delete shared network scoped to user
...
account.
2013-10-14 16:37:38 -07:00
67186429e1
Spring Modularization
...
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Alena Prokharchyk
Jayapal
Hugo Trippaers
Alex Huang
Harikrishna Patnala
Darren Shepherd
Wei Zhou
Murali Reddy
Kelven Yang
Daan Hoogland
Sheng Yang
Rajesh Battala
Syed
Kishan Kavala
Bharat Kumar
Donal Lafferty
Will Stevens
ynojima
Marcus Sorensen
dhoogland
Min Chen
Darren Shepherd