You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/25 21:03:41 UTC
[1/6] git commit: updated refs/heads/master to b69dff7
Repository: cloudstack
Updated Branches:
refs/heads/master 8a09f88d7 -> b69dff790
CLOUDSTACK-8838: Allow ensX enoX enpX enxX format for nics in CentOS 7
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8c5ed4e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8c5ed4e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8c5ed4e
Branch: refs/heads/master
Commit: e8c5ed4e3de8129895feb648066f0c29f49da63d
Parents: ff1ce07
Author: Satoru Nakaya <gi...@gmail.com>
Authored: Sun Sep 13 22:13:30 2015 +0900
Committer: Satoru Nakaya <gi...@gmail.com>
Committed: Sun Sep 13 22:13:30 2015 +0900
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8c5ed4e/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index bc57c2c..864afa7 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1161,12 +1161,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
final String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
- fname.matches("^p\\d+p\\d+.*")) {
+ fname.matches("^p\\d+p\\d+.*") || fname.startsWith("ens") || fname.startsWith("eno") || fname.startsWith("enp") || fname.startsWith("enx")) {
return fname;
}
}
- s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
+ s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, vlan*, em*, p*p*, ens*, eno*, enp*, or enx* in " + brif.getAbsolutePath());
return "";
}
[4/6] git commit: updated refs/heads/master to b69dff7
Posted by re...@apache.org.
Merge branch 'pr/966' into interfacePatternCheck
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1ea27ed
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1ea27ed
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1ea27ed
Branch: refs/heads/master
Commit: f1ea27ed37b4a0c24c932f294c32c43e0f9642bf
Parents: fea976a e1a401c
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Oct 23 17:10:03 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Oct 23 17:10:03 2015 +0200
----------------------------------------------------------------------
agent/conf/log4j-cloud.xml.in | 2 +-
agent/src/com/cloud/agent/Agent.java | 8 +-
api/src/com/cloud/event/EventTypes.java | 28 +-
.../apache/cloudstack/alert/AlertService.java | 1 +
.../command/admin/account/DeleteAccountCmd.java | 5 +
.../api/response/FirewallResponse.java | 8 +-
.../apache/cloudstack/context/CallContext.java | 10 +
.../classes/resources/messages.properties | 4 +-
.../cloud/storage/template/OVAProcessor.java | 2 +-
.../cloud/storage/template/QCOW2Processor.java | 17 +-
.../storage/template/TemplateLocation.java | 4 +-
.../cloud/storage/template/VhdProcessor.java | 17 +-
.../storage/command/DownloadCommand.java | 1 +
.../storage/template/OVAProcessorTest.java | 138 ++++
.../storage/template/QCOW2ProcessorTest.java | 109 +++
.../storage/template/VhdProcessorTest.java | 110 +++
.../vm/VirtualMachinePowerStateSyncImpl.java | 16 +-
.../src/com/cloud/vm/VmWorkStart.java | 3 +-
.../orchestration/NetworkOrchestrator.java | 1 +
.../cloud/dc/dao/DataCenterIpAddressDao.java | 2 +
.../dc/dao/DataCenterIpAddressDaoImpl.java | 27 +
.../src/com/cloud/network/dao/IPAddressDao.java | 2 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 21 +
.../src/com/cloud/storage/dao/VolumeDao.java | 4 +
.../com/cloud/storage/dao/VolumeDaoImpl.java | 17 +
.../cloud/upgrade/DatabaseUpgradeChecker.java | 3 +
.../com/cloud/upgrade/dao/Upgrade452to453.java | 67 ++
.../com/cloud/upgrade/dao/Upgrade453to460.java | 29 +
.../src/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 10 +
.../storage/image/TemplateServiceImpl.java | 1 +
.../storage/image/BaseImageStoreDriverImpl.java | 12 +
packaging/centos7/cloud-usage-sysd | 90 ---
packaging/centos7/cloud-usage.service | 37 -
packaging/centos7/cloud-usage.sysconfig | 31 -
packaging/centos7/cloud.spec | 39 +-
packaging/systemd/cloudstack-agent.service | 38 +
packaging/systemd/cloudstack-usage.service | 38 +
.../kvm/resource/LibvirtComputingResource.java | 6 +-
.../LibvirtBackupSnapshotCommandWrapper.java | 2 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 18 +-
.../xenserver/resource/CitrixResourceBase.java | 45 +-
.../resource/XenServerStorageProcessor.java | 32 +-
.../xenbase/CitrixStartCommandWrapper.java | 21 +-
.../network/lb/LoadBalanceRuleHandler.java | 6 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 6 +-
.../contrail/management/ServiceManagerImpl.java | 6 +-
pom.xml | 2 +-
scripts/network/domr/router_proxy.sh | 11 -
.../src/com/cloud/alert/AlertManagerImpl.java | 3 +-
server/src/com/cloud/api/ApiDispatcher.java | 9 +
server/src/com/cloud/api/ApiResponseHelper.java | 4 +-
server/src/com/cloud/api/ApiServer.java | 15 +-
.../cloud/api/dispatch/ParamProcessWorker.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 217 ++----
.../com/cloud/event/ActionEventInterceptor.java | 2 +-
.../src/com/cloud/event/ActionEventUtils.java | 40 +-
.../network/StorageNetworkManagerImpl.java | 25 +-
.../network/firewall/FirewallManagerImpl.java | 3 +-
.../cloud/network/router/NetworkHelperImpl.java | 6 +-
.../VirtualNetworkApplianceManagerImpl.java | 26 +-
.../com/cloud/projects/ProjectManagerImpl.java | 1 +
.../com/cloud/server/ManagementServerImpl.java | 1 -
.../storage/ImageStoreUploadMonitorImpl.java | 55 +-
.../storage/snapshot/SnapshotManagerImpl.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 7 +-
.../configuration/ConfigurationManagerTest.java | 266 ++++++-
.../network/firewall/FirewallManagerTest.java | 83 +-
.../storage/template/DownloadManagerImpl.java | 8 +-
setup/db/db/schema-452to453-cleanup.sql | 20 +
setup/db/db/schema-452to453.sql | 20 +
setup/db/db/schema-452to460.sql | 2 +
.../patches/debian/config/etc/dnsmasq.conf.tmpl | 4 +-
.../debian/config/etc/init.d/cloud-early-config | 35 +-
.../config/etc/iptables/iptables-dhcpsrvr | 58 ++
.../debian/config/opt/cloud/bin/checkrouter.sh | 19 +-
.../debian/config/opt/cloud/bin/configure.py | 67 +-
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 104 ++-
.../debian/config/opt/cloud/bin/cs/CsApp.py | 2 +-
.../debian/config/opt/cloud/bin/cs/CsDatabag.py | 1 +
.../debian/config/opt/cloud/bin/cs/CsDhcp.py | 14 +-
.../debian/config/opt/cloud/bin/cs/CsFile.py | 7 +-
.../debian/config/opt/cloud/bin/cs/CsHelper.py | 7 +-
.../config/opt/cloud/bin/cs/CsLoadBalancer.py | 50 +-
.../config/opt/cloud/bin/cs/CsNetfilter.py | 8 +-
.../debian/config/opt/cloud/bin/cs/CsProcess.py | 2 +
.../config/opt/cloud/bin/cs/CsRedundant.py | 69 +-
.../debian/config/opt/cloud/bin/cs/CsRoute.py | 9 +-
.../patches/debian/config/opt/cloud/bin/ian.py | 27 -
.../debian/config/opt/cloud/bin/master.py | 3 +
.../debian/config/opt/cloud/bin/vr_cfg.sh | 11 +
.../opt/cloud/templates/checkrouter.sh.templ | 19 +-
.../test_routers_iptables_default_policy.py | 73 +-
.../component/test_routers_network_ops.py | 455 +++++++++++
.../component/test_security_groups.py | 28 +-
.../test_simultaneous_volume_attach.py | 255 ++++++
.../integration/component/test_vpc_redundant.py | 219 ++++--
.../component/test_vpc_router_nics.py | 157 ++--
test/integration/smoke/test_internal_lb.py | 768 +++++++++++++++++--
test/integration/smoke/test_loadbalance.py | 139 ++--
test/integration/smoke/test_privategw_acl.py | 270 +++++--
test/integration/smoke/test_scale_vm.py | 76 +-
test/integration/smoke/test_ssvm.py | 91 ++-
test/integration/smoke/test_vm_snapshots.py | 36 +-
test/integration/smoke/test_vpc_vpn.py | 764 +++++++++++++-----
tools/apidoc/pom.xml | 6 +
.../definitions/systemvmtemplate/definition.rb | 12 +-
tools/devcloud4/advanced/Vagrantfile | 2 +-
tools/devcloud4/basic/Vagrantfile | 2 +-
.../binary-installation-advanced/Vagrantfile | 2 +-
.../binary-installation-basic/Vagrantfile | 2 +-
tools/marvin/marvin/config/test_data.py | 30 +-
tools/marvin/marvin/lib/base.py | 10 +-
tools/marvin/pom.xml | 10 +
ui/dictionary2.jsp | 1 +
ui/scripts/ui-custom/zoneWizard.js | 2 +-
ui/scripts/ui/widgets/listView.js | 2 +-
usage/conf/log4j-cloud_usage.xml.in | 6 +-
.../java/com/cloud/utils/nio/NioConnection.java | 1 +
.../com/cloud/utils/storage/QCOW2UtilsTest.java | 121 +++
.../hypervisor/vmware/util/VmwareClient.java | 88 ++-
122 files changed, 4661 insertions(+), 1413 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1ea27ed/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --cc plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 864afa7,db4b9e8..ef6b827
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@@ -1160,13 -1160,13 +1160,13 @@@ public class LibvirtComputingResource e
for (int i = 0; i < interfaces.length; i++) {
final String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
- if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
+ if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("team") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
- fname.matches("^p\\d+p\\d+.*")) {
+ fname.matches("^p\\d+p\\d+.*") || fname.startsWith("ens") || fname.startsWith("eno") || fname.startsWith("enp") || fname.startsWith("enx")) {
return fname;
}
}
- s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, vlan*, em*, p*p*, ens*, eno*, enp*, or enx* in " + brif.getAbsolutePath());
- s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, team*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
++ s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, team*, vlan*, em*, p*p*, ens*, eno*, enp*, or enx* in " + brif.getAbsolutePath());
return "";
}
[3/6] git commit: updated refs/heads/master to b69dff7
Posted by re...@apache.org.
Merge branch 'pr/812' into interfacePatternCheck
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fea976a6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fea976a6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fea976a6
Branch: refs/heads/master
Commit: fea976a694224e72bd8604d04a0031e1babda9db
Parents: 8d96aab e8c5ed4
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Oct 23 17:07:34 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Oct 23 17:07:34 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 -
CONTRIBUTING.md | 1 -
Dockerfile | 37 -
agent/bindir/cloud-setup-agent.in | 2 +-
agent/bindir/libvirtqemuhook.in | 15 +-
agent/conf/agent.properties | 16 +
agent/src/com/cloud/agent/Agent.java | 125 +-
agent/src/com/cloud/agent/AgentShell.java | 1 +
.../exception/StorageConflictException.java | 27 +
api/src/com/cloud/storage/Volume.java | 5 +
.../storage/snapshot/SnapshotApiService.java | 2 +-
.../com/cloud/template/TemplateApiService.java | 2 +-
api/src/com/cloud/vm/Nic.java | 28 +-
api/src/com/cloud/vm/NicProfile.java | 443 +--
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../command/admin/account/CreateAccountCmd.java | 15 +-
.../admin/template/PrepareTemplateCmd.java | 16 +-
.../api/command/admin/user/CreateUserCmd.java | 13 +-
.../autoscale/CreateAutoScalePolicyCmd.java | 2 +-
.../user/config/ListCapabilitiesCmd.java | 5 +-
.../user/snapshot/RevertSnapshotCmd.java | 18 +-
.../user/template/CreateTemplateCmd.java | 52 +-
.../api/command/user/vm/DestroyVMCmd.java | 4 +-
.../api/command/user/vm/UpdateVMCmd.java | 8 +-
.../api/response/CapabilitiesResponse.java | 20 +-
.../cloudstack/api/response/HostResponse.java | 39 +-
.../api/response/SecurityGroupResponse.java | 24 +-
.../apache/cloudstack/query/QueryService.java | 5 +
.../admin/account/CreateAccountCmdTest.java | 100 +
.../command/admin/user/CreateUserCmdTest.java | 96 +
.../api/command/test/AddVpnUserCmdTest.java | 26 -
.../api/response/HostResponseTest.java | 80 +
.../classes/resources/messages.properties | 75 +-
.../classes/resources/messages_de_DE.properties | 89 +-
.../classes/resources/messages_es.properties | 3 +-
.../classes/resources/messages_fr_FR.properties | 102 +-
.../classes/resources/messages_hu.properties | 288 +-
.../classes/resources/messages_it_IT.properties | 2 -
.../classes/resources/messages_ja_JP.properties | 1446 ++++-----
.../classes/resources/messages_ko_KR.properties | 5 +-
.../classes/resources/messages_nb_NO.properties | 330 +-
.../classes/resources/messages_nl_NL.properties | 7 +-
.../classes/resources/messages_pt_BR.properties | 541 +++-
.../classes/resources/messages_ru_RU.properties | 837 ++---
.../classes/resources/messages_zh_CN.properties | 1370 ++++----
client/tomcatconf/commands.properties.in | 6 +-
.../com/cloud/agent/api/AttachVolumeAnswer.java | 64 -
.../cloud/agent/api/AttachVolumeCommand.java | 216 --
.../agent/api/CreateVMSnapshotCommand.java | 8 +-
.../agent/api/ModifyStoragePoolAnswer.java | 9 +
.../agent/api/RevertToVMSnapshotCommand.java | 12 +-
.../agent/api/storage/MigrateVolumeAnswer.java | 9 +
.../template/LocalTemplateDownloader.java | 16 +-
.../cloud/storage/template/OVAProcessor.java | 3 +-
.../storage/template/S3TemplateDownloader.java | 169 +-
.../storage/template/TemplateLocation.java | 24 +-
.../cloud/storage/template/VmdkProcessor.java | 11 +-
.../storage/command/RevertSnapshotCommand.java | 49 +
.../template/LocalTemplateDownloaderTest.java | 41 +
.../api/agent/test/AttachVolumeAnswerTest.java | 66 -
.../api/agent/test/AttachVolumeCommandTest.java | 115 -
debian/changelog | 2 +-
debian/cloudstack-common.install | 1 +
debian/control | 10 +-
debian/rules | 2 +-
.../api/storage/HypervisorHostListener.java | 4 +-
.../api/storage/PrimaryDataStoreDriver.java | 2 +-
.../subsystem/api/storage/SnapshotService.java | 2 +-
.../subsystem/api/storage/SnapshotStrategy.java | 2 +-
.../cloud/agent/manager/AgentManagerImpl.java | 46 +-
.../manager/ClusteredAgentManagerImpl.java | 366 ++-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 4 +-
.../src/com/cloud/vm/VmWorkMigrateForScale.java | 16 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 3 +
.../orchestration/NetworkOrchestrator.java | 75 +-
.../orchestration/NetworkOrchestratorTest.java | 16 +-
.../certificate/dao/CertificateDaoImpl.java | 10 -
.../dc/dao/DataCenterIpAddressDaoImpl.java | 23 +-
.../src/com/cloud/host/dao/HostDaoImpl.java | 31 +-
.../src/com/cloud/network/dao/VpnUserDao.java | 2 +-
.../security/dao/VmRulesetLogDaoImpl.java | 2 +-
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 10 +-
.../com/cloud/storage/dao/VMTemplateDao.java | 4 +
.../cloud/storage/dao/VMTemplateDaoImpl.java | 20 +-
.../com/cloud/upgrade/dao/LegacyDbUpgrade.java | 42 +
.../com/cloud/upgrade/dao/Upgrade218to22.java | 3055 +++++++++---------
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 11 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 6 +
.../com/cloud/upgrade/dao/Upgrade229to2210.java | 41 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 64 +-
.../com/cloud/upgrade/dao/Upgrade302to303.java | 59 +-
.../com/cloud/upgrade/dao/Upgrade302to40.java | 326 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 61 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 88 +-
.../com/cloud/upgrade/dao/Upgrade306to307.java | 19 +-
.../com/cloud/upgrade/dao/Upgrade307to410.java | 11 +-
.../com/cloud/upgrade/dao/Upgrade30to301.java | 19 +-
.../com/cloud/upgrade/dao/Upgrade30xBase.java | 84 +-
.../com/cloud/upgrade/dao/Upgrade40to41.java | 11 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 761 ++---
.../com/cloud/upgrade/dao/Upgrade420to421.java | 335 +-
.../com/cloud/upgrade/dao/Upgrade442to450.java | 38 +-
.../com/cloud/upgrade/dao/Upgrade450to451.java | 132 +-
.../src/com/cloud/user/UserAccountVO.java | 2 +-
engine/schema/src/com/cloud/vm/NicVO.java | 62 +-
.../com/cloud/vm/dao/DomainRouterDaoImpl.java | 3 +-
.../schema/src/com/cloud/vm/dao/NicDaoImpl.java | 10 +-
.../src/com/cloud/vm/dao/UserVmDaoImpl.java | 8 +-
.../datastore/db/PrimaryDataStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 32 +-
.../datastore/db/SnapshotDataStoreDao.java | 3 +
.../cache/manager/StorageCacheManagerImpl.java | 106 +-
.../motion/AncientDataMotionStrategy.java | 4 +
.../storage/image/TemplateServiceImpl.java | 4 +-
.../snapshot/SnapshotDataFactoryImpl.java | 5 +-
.../storage/snapshot/SnapshotServiceImpl.java | 11 +-
.../storage/snapshot/SnapshotStrategyBase.java | 4 +-
.../snapshot/StorageSystemSnapshotStrategy.java | 54 +-
.../snapshot/XenserverSnapshotStrategy.java | 2 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 4 +-
.../endpoint/DefaultEndPointSelector.java | 19 +-
.../storage/helper/HypervisorHelperImpl.java | 2 +-
.../image/db/SnapshotDataStoreDaoImpl.java | 86 +-
.../datastore/provider/DefaultHostListener.java | 16 +-
.../cloudstack/storage/volume/VolumeObject.java | 3 +-
.../com/cloud/cluster/ClusterManagerImpl.java | 16 +-
.../cluster/ClusterServiceServletAdapter.java | 6 +-
.../cluster/ClusterServiceServletContainer.java | 2 +
.../cluster/ClusterServiceServletImpl.java | 11 -
.../ClusterServiceServletAdapterTest.java | 47 +
.../config/dao/ConfigurationDaoImpl.java | 32 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 23 +-
framework/db/src/com/cloud/utils/db/DbUtil.java | 106 +-
.../db/src/com/cloud/utils/db/Merovingian2.java | 11 +-
.../test/com/cloud/utils/db/GlobalLockTest.java | 1 +
.../com/cloud/utils/db/TransactionTest.java | 75 +-
.../client/ClientTransportProvider.java | 9 +-
.../framework/messagebus/MessageBusBase.java | 1 +
.../framework/messagebus/MessageDetector.java | 1 +
.../serializer/OnwireClassRegistry.java | 46 +-
.../codestyle/ClientOnlyEventDrivenStyle.java | 58 -
.../codestyle/ClientOnlyListenerStyle.java | 58 -
.../sampleserver/SampleManagementServer.java | 4 +
.../cloudstack/messagebus/TestMessageBus.java | 13 +-
.../framework/jobs/dao/VmWorkJobDaoImpl.java | 21 +-
.../jobs/impl/SyncQueueManagerImpl.java | 1 +
.../framework/jobs/AsyncJobManagerTest.java | 2 +
.../framework/jobs/AsyncJobTestDispatcher.java | 1 +
.../factory/ModuleBasedContextFactoryTest.java | 3 +
.../src/com/cloud/utils/db/StaticStrategy.java | 4 +
.../BareMetalPingServiceImpl.java | 23 +-
.../networkservice/BareMetalResourceBase.java | 1 +
.../networkservice/BaremetaNetworkGuru.java | 35 +-
.../BaremetalDhcpManagerImpl.java | 36 +-
.../BaremetalKickStartServiceImpl.java | 44 +-
.../networkservice/BaremetalPxeManagerImpl.java | 11 +-
.../HypervResource/CloudStackTypes.cs | 2 -
.../hypervisor/hyperv/guru/HypervGuru.java | 14 +-
.../resource/HypervDirectConnectResource.java | 15 +-
.../kvm/resource/BridgeVifDriver.java | 13 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 79 +-
.../LibvirtAttachVolumeCommandWrapper.java | 60 -
.../LibvirtBackupSnapshotCommandWrapper.java | 8 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 12 +-
.../wrapper/LibvirtFenceCommandWrapper.java | 12 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 10 +-
.../LibvirtResizeVolumeCommandWrapper.java | 4 +-
.../LibvirtRevertSnapshotCommandWrapper.java | 95 +
.../kvm/storage/KVMStoragePoolManager.java | 1 +
.../resource/LibvirtComputingResourceTest.java | 151 +-
.../vm/hypervisor/ovm/OvmSecurityGroupModule.py | 10 +-
.../cloud/ovm/hypervisor/OvmResourceBase.java | 8 -
.../ovm3/resources/Ovm3HypervisorResource.java | 1 -
.../ovm3/resources/helpers/Ovm3VmSupport.java | 9 +-
.../resources/helpers/Ovm3VmSupportTest.java | 12 -
.../cloud/agent/manager/MockStorageManager.java | 4 -
.../agent/manager/MockStorageManagerImpl.java | 32 -
.../com/cloud/agent/manager/MockVmManager.java | 12 +-
.../cloud/agent/manager/MockVmManagerImpl.java | 45 +-
.../agent/manager/SimulatorManagerImpl.java | 15 +-
.../cloud/resource/AgentRoutingResource.java | 1 +
.../simulator/dao/MockConfigurationDaoImpl.java | 24 +-
.../com/cloud/hypervisor/guru/VMwareGuru.java | 11 +-
.../vmware/manager/VmwareManagerImpl.java | 1 +
.../manager/VmwareStorageManagerImpl.java | 8 +-
.../vmware/resource/VmwareResource.java | 44 +-
.../resource/VmwareStorageProcessor.java | 4 +-
.../motion/VmwareStorageMotionStrategy.java | 3 +
.../xenserver/resource/CitrixResourceBase.java | 14 +-
.../xenserver/resource/XcpOssResource.java | 19 +-
.../xenserver/resource/XcpServerResource.java | 18 +-
.../resource/XenServer56FP1Resource.java | 17 +-
.../xenserver/resource/XenServer56Resource.java | 27 +-
.../resource/XenServer56SP2Resource.java | 19 -
.../resource/XenServer600Resource.java | 19 +-
.../resource/XenServer650Resource.java | 18 +-
.../resource/Xenserver625Resource.java | 22 +-
.../CitrixAttachVolumeCommandWrapper.java | 146 -
.../resource/XcpOssResourcePathTest.java | 32 +
.../resource/XcpServerResourcePathTest.java | 32 +
.../XenServer56FP1ResourcePathTest.java | 32 +
.../resource/XenServer56ResourcePathTest.java | 32 +
.../XenServer56SP2ResourcePathTest.java | 32 +
.../resource/XenServer600ResourcePathTest.java | 32 +
.../resource/XenServer625ResourcePathTest.java | 32 +
.../resource/XenServer650ResourcePathTest.java | 32 +
.../xenbase/CitrixRequestWrapperTest.java | 86 +-
.../network/bigswitch/BigSwitchBcfUtils.java | 2 +-
.../network/element/BigSwitchBcfElement.java | 2 +-
.../guru/BigSwitchBcfGuestNetworkGuru.java | 2 +-
.../cloudstack/network/element/DnsNotifier.java | 8 +-
.../lb/ElasticLoadBalancerManagerImpl.java | 22 +-
.../cloudstack/element/GloboDnsElement.java | 4 +-
.../cloudstack/element/GloboDnsElementTest.java | 8 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 34 +-
.../InternalLBVMManagerTest.java | 6 +-
.../management/ContrailElementImpl.java | 22 +-
.../contrail/management/ContrailGuru.java | 27 +-
.../management/ManagementNetworkGuru.java | 8 +-
.../network/contrail/model/ModelObject.java | 6 +-
.../contrail/model/VMInterfaceModel.java | 15 +-
.../contrail/model/InstanceIpModelTest.java | 26 +-
.../contrail/model/VMInterfaceModelTest.java | 25 +-
.../cloud/network/element/MidoNetElement.java | 22 +-
.../network/guru/MidoNetPublicNetworkGuru.java | 32 +-
.../network/element/MidoNetElementTest.java | 6 +-
.../network/resource/NetscalerResource.java | 4 +-
plugins/network-elements/nicira-nvp/pom.xml | 24 +-
.../META-INF/cloudstack/nvp/module.properties | 21 -
.../cloudstack/nvp/spring-nvp-context.xml | 42 -
...ortForwardingRulesOnLogicalRouterAnswer.java | 35 -
...rtForwardingRulesOnLogicalRouterCommand.java | 63 -
...ConfigurePublicIpsOnLogicalRouterAnswer.java | 32 -
...onfigurePublicIpsOnLogicalRouterCommand.java | 66 -
...gureStaticNatRulesOnLogicalRouterAnswer.java | 44 -
...ureStaticNatRulesOnLogicalRouterCommand.java | 65 -
.../agent/api/CreateLogicalRouterAnswer.java | 42 -
.../agent/api/CreateLogicalRouterCommand.java | 116 -
.../agent/api/CreateLogicalSwitchAnswer.java | 38 -
.../agent/api/CreateLogicalSwitchCommand.java | 57 -
.../api/CreateLogicalSwitchPortAnswer.java | 38 -
.../api/CreateLogicalSwitchPortCommand.java | 56 -
.../agent/api/DeleteLogicalRouterAnswer.java | 34 -
.../agent/api/DeleteLogicalRouterCommand.java | 44 -
.../agent/api/DeleteLogicalSwitchAnswer.java | 32 -
.../agent/api/DeleteLogicalSwitchCommand.java | 38 -
.../api/DeleteLogicalSwitchPortAnswer.java | 32 -
.../api/DeleteLogicalSwitchPortCommand.java | 44 -
.../agent/api/FindLogicalSwitchPortAnswer.java | 38 -
.../agent/api/FindLogicalSwitchPortCommand.java | 44 -
.../agent/api/StartupNiciraNvpCommand.java | 30 -
.../api/UpdateLogicalSwitchPortAnswer.java | 38 -
.../api/UpdateLogicalSwitchPortCommand.java | 63 -
.../api/commands/AddNiciraNvpDeviceCmd.java | 154 -
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 112 -
.../ListNiciraNvpDeviceNetworksCmd.java | 111 -
.../api/commands/ListNiciraNvpDevicesCmd.java | 108 -
.../api/response/NiciraNvpDeviceResponse.java | 89 -
.../com/cloud/network/NiciraNvpDeviceVO.java | 99 -
.../cloud/network/NiciraNvpNicMappingVO.java | 87 -
.../cloud/network/NiciraNvpRouterMappingVO.java | 85 -
.../src/com/cloud/network/dao/NiciraNvpDao.java | 35 -
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 53 -
.../network/dao/NiciraNvpNicMappingDao.java | 32 -
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 51 -
.../network/dao/NiciraNvpRouterMappingDao.java | 28 -
.../dao/NiciraNvpRouterMappingDaoImpl.java | 51 -
.../cloud/network/element/NiciraNvpElement.java | 849 -----
.../element/NiciraNvpElementService.java | 45 -
.../network/guru/NiciraNvpGuestNetworkGuru.java | 256 --
.../network/nicira/AccessConfiguration.java | 44 -
.../com/cloud/network/nicira/AccessRule.java | 58 -
.../src/com/cloud/network/nicira/Acl.java | 23 -
.../src/com/cloud/network/nicira/AclRule.java | 209 --
.../com/cloud/network/nicira/Attachment.java | 24 -
.../cloud/network/nicira/BaseNiciraEntity.java | 85 -
.../network/nicira/BaseNiciraNamedEntity.java | 44 -
.../network/nicira/ControlClusterStatus.java | 87 -
.../network/nicira/DestinationNatRule.java | 113 -
.../network/nicira/L3GatewayAttachment.java | 55 -
.../com/cloud/network/nicira/LogicalRouter.java | 71 -
.../cloud/network/nicira/LogicalRouterPort.java | 62 -
.../com/cloud/network/nicira/LogicalSwitch.java | 60 -
.../cloud/network/nicira/LogicalSwitchPort.java | 82 -
.../src/com/cloud/network/nicira/Match.java | 146 -
.../src/com/cloud/network/nicira/NatRule.java | 130 -
.../com/cloud/network/nicira/NiciraNvpApi.java | 658 ----
.../network/nicira/NiciraNvpApiException.java | 39 -
.../com/cloud/network/nicira/NiciraNvpList.java | 48 -
.../com/cloud/network/nicira/NiciraNvpTag.java | 64 -
.../cloud/network/nicira/PatchAttachment.java | 41 -
.../com/cloud/network/nicira/RouterNextHop.java | 40 -
.../com/cloud/network/nicira/RoutingConfig.java | 24 -
.../nicira/RoutingTableRoutingConfig.java | 30 -
.../cloud/network/nicira/SecurityProfile.java | 24 -
.../com/cloud/network/nicira/SecurityRule.java | 138 -
...SingleDefaultRouteImplicitRoutingConfig.java | 40 -
.../com/cloud/network/nicira/SourceNatRule.java | 119 -
.../network/nicira/TransportZoneBinding.java | 50 -
.../com/cloud/network/nicira/VifAttachment.java | 78 -
.../resource/NiciraNvpRequestWrapper.java | 77 -
.../network/resource/NiciraNvpResource.java | 319 --
.../network/resource/NiciraNvpUtilities.java | 65 -
...figurePortForwardingRulesCommandWrapper.java | 120 -
...ciraNvpConfigurePublicIpsCommandWrapper.java | 60 -
...vpConfigureStaticNatRulesCommandWrapper.java | 113 -
...iraNvpCreateLogicalRouterCommandWrapper.java | 152 -
...iraNvpCreateLogicalSwitchCommandWrapper.java | 73 -
...vpCreateLogicalSwitchPortCommandWrapper.java | 70 -
...iraNvpDeleteLogicalRouterCommandWrapper.java | 50 -
...iraNvpDeleteLogicalSwitchCommandWrapper.java | 49 -
...vpDeleteLogicalSwitchPortCommandWrapper.java | 50 -
...aNvpFindLogicalSwitchPortCommandWrapper.java | 59 -
.../NiciraNvpMaintainCommandWrapper.java | 36 -
.../wrapper/NiciraNvpReadyCommandWrapper.java | 36 -
...vpUpdateLogicalSwitchPortCommandWrapper.java | 68 -
.../network/utils/CommandRetryUtility.java | 89 -
...ortForwardingRulesOnLogicalRouterAnswer.java | 35 +
...rtForwardingRulesOnLogicalRouterCommand.java | 63 +
...ConfigurePublicIpsOnLogicalRouterAnswer.java | 32 +
...onfigurePublicIpsOnLogicalRouterCommand.java | 66 +
...gureStaticNatRulesOnLogicalRouterAnswer.java | 44 +
...ureStaticNatRulesOnLogicalRouterCommand.java | 65 +
.../agent/api/CreateLogicalRouterAnswer.java | 42 +
.../agent/api/CreateLogicalRouterCommand.java | 116 +
.../agent/api/CreateLogicalSwitchAnswer.java | 38 +
.../agent/api/CreateLogicalSwitchCommand.java | 57 +
.../api/CreateLogicalSwitchPortAnswer.java | 38 +
.../api/CreateLogicalSwitchPortCommand.java | 56 +
.../agent/api/DeleteLogicalRouterAnswer.java | 34 +
.../agent/api/DeleteLogicalRouterCommand.java | 44 +
.../agent/api/DeleteLogicalSwitchAnswer.java | 32 +
.../agent/api/DeleteLogicalSwitchCommand.java | 38 +
.../api/DeleteLogicalSwitchPortAnswer.java | 32 +
.../api/DeleteLogicalSwitchPortCommand.java | 44 +
.../agent/api/FindLogicalSwitchPortAnswer.java | 38 +
.../agent/api/FindLogicalSwitchPortCommand.java | 44 +
.../agent/api/StartupNiciraNvpCommand.java | 30 +
.../api/UpdateLogicalSwitchPortAnswer.java | 38 +
.../api/UpdateLogicalSwitchPortCommand.java | 63 +
.../api/commands/AddNiciraNvpDeviceCmd.java | 154 +
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 112 +
.../ListNiciraNvpDeviceNetworksCmd.java | 111 +
.../api/commands/ListNiciraNvpDevicesCmd.java | 108 +
.../api/response/NiciraNvpDeviceResponse.java | 89 +
.../com/cloud/network/NiciraNvpDeviceVO.java | 99 +
.../cloud/network/NiciraNvpNicMappingVO.java | 87 +
.../cloud/network/NiciraNvpRouterMappingVO.java | 85 +
.../com/cloud/network/dao/NiciraNvpDao.java | 35 +
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 53 +
.../network/dao/NiciraNvpNicMappingDao.java | 32 +
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 51 +
.../network/dao/NiciraNvpRouterMappingDao.java | 28 +
.../dao/NiciraNvpRouterMappingDaoImpl.java | 51 +
.../cloud/network/element/NiciraNvpElement.java | 849 +++++
.../element/NiciraNvpElementService.java | 45 +
.../network/guru/NiciraNvpGuestNetworkGuru.java | 251 ++
.../network/nicira/AccessConfiguration.java | 44 +
.../com/cloud/network/nicira/AccessRule.java | 58 +
.../main/java/com/cloud/network/nicira/Acl.java | 23 +
.../java/com/cloud/network/nicira/AclRule.java | 209 ++
.../com/cloud/network/nicira/Attachment.java | 24 +
.../cloud/network/nicira/BaseNiciraEntity.java | 85 +
.../network/nicira/BaseNiciraNamedEntity.java | 44 +
.../network/nicira/ControlClusterStatus.java | 87 +
.../network/nicira/DestinationNatRule.java | 113 +
.../cloud/network/nicira/ExecutionCounter.java | 50 +
.../network/nicira/L3GatewayAttachment.java | 55 +
.../com/cloud/network/nicira/LogicalRouter.java | 71 +
.../cloud/network/nicira/LogicalRouterPort.java | 62 +
.../com/cloud/network/nicira/LogicalSwitch.java | 60 +
.../cloud/network/nicira/LogicalSwitchPort.java | 82 +
.../java/com/cloud/network/nicira/Match.java | 146 +
.../java/com/cloud/network/nicira/NatRule.java | 130 +
.../cloud/network/nicira/NatRuleAdapter.java | 49 +
.../cloud/network/nicira/NiciraConstants.java | 42 +
.../com/cloud/network/nicira/NiciraNvpApi.java | 627 ++++
.../network/nicira/NiciraNvpApiException.java | 39 +
.../com/cloud/network/nicira/NiciraNvpList.java | 48 +
.../com/cloud/network/nicira/NiciraNvpTag.java | 64 +
.../cloud/network/nicira/NiciraRestClient.java | 202 ++
.../cloud/network/nicira/PatchAttachment.java | 41 +
.../com/cloud/network/nicira/RouterNextHop.java | 40 +
.../com/cloud/network/nicira/RoutingConfig.java | 24 +
.../network/nicira/RoutingConfigAdapter.java | 52 +
.../nicira/RoutingTableRoutingConfig.java | 30 +
.../cloud/network/nicira/SecurityProfile.java | 24 +
.../com/cloud/network/nicira/SecurityRule.java | 138 +
...SingleDefaultRouteImplicitRoutingConfig.java | 40 +
.../com/cloud/network/nicira/SourceNatRule.java | 119 +
.../network/nicira/TransportZoneBinding.java | 50 +
.../com/cloud/network/nicira/VifAttachment.java | 78 +
.../resource/NiciraNvpRequestWrapper.java | 77 +
.../network/resource/NiciraNvpResource.java | 335 ++
.../network/resource/NiciraNvpUtilities.java | 65 +
...figurePortForwardingRulesCommandWrapper.java | 122 +
...ciraNvpConfigurePublicIpsCommandWrapper.java | 61 +
...vpConfigureStaticNatRulesCommandWrapper.java | 114 +
...iraNvpCreateLogicalRouterCommandWrapper.java | 152 +
...iraNvpCreateLogicalSwitchCommandWrapper.java | 73 +
...vpCreateLogicalSwitchPortCommandWrapper.java | 70 +
...iraNvpDeleteLogicalRouterCommandWrapper.java | 50 +
...iraNvpDeleteLogicalSwitchCommandWrapper.java | 49 +
...vpDeleteLogicalSwitchPortCommandWrapper.java | 50 +
...aNvpFindLogicalSwitchPortCommandWrapper.java | 60 +
.../NiciraNvpMaintainCommandWrapper.java | 36 +
.../wrapper/NiciraNvpReadyCommandWrapper.java | 36 +
...vpUpdateLogicalSwitchPortCommandWrapper.java | 68 +
.../network/utils/CommandRetryUtility.java | 89 +
.../META-INF/cloudstack/nvp/module.properties | 21 +
.../cloudstack/nvp/spring-nvp-context.xml | 42 +
.../network/element/NiciraNvpElementTest.java | 217 ++
.../guru/NiciraNvpGuestNetworkGuruTest.java | 476 +++
.../network/nicira/ExecutionCounterTest.java | 55 +
.../network/nicira/NatRuleAdapterTest.java | 60 +
.../com/cloud/network/nicira/NatRuleTest.java | 55 +
.../cloud/network/nicira/NiciraNvpApiIT.java | 319 ++
.../cloud/network/nicira/NiciraNvpApiTest.java | 198 ++
.../network/nicira/NiciraRestClientTest.java | 172 +
.../com/cloud/network/nicira/NiciraTagTest.java | 58 +
.../nicira/RoutingConfigAdapterTest.java | 57 +
.../resource/NiciraNvpRequestWrapperTest.java | 250 ++
.../network/resource/NiciraNvpResourceTest.java | 829 +++++
.../src/test/resources/config.properties | 23 +
.../network/element/NiciraNvpElementTest.java | 217 --
.../guru/NiciraNvpGuestNetworkGuruTest.java | 472 ---
.../com/cloud/network/nicira/NatRuleTest.java | 55 -
.../cloud/network/nicira/NiciraNvpApiIT.java | 347 --
.../cloud/network/nicira/NiciraNvpApiTest.java | 339 --
.../com/cloud/network/nicira/NiciraTagTest.java | 58 -
.../resource/NiciraNvpRequestWrapperTest.java | 255 --
.../network/resource/NiciraNvpResourceTest.java | 882 -----
.../nicira-nvp/test/resources/config.properties | 23 -
.../network/guru/NuageVspGuestNetworkGuru.java | 12 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 69 +-
.../ElastistorPrimaryDataStoreDriver.java | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 11 +-
.../driver/NexentaPrimaryDataStoreDriver.java | 2 +-
.../SamplePrimaryDataStoreDriverImpl.java | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 23 +-
...olidFireSharedPrimaryDataStoreLifeCycle.java | 24 +-
.../storage/datastore/util/SolidFireUtil.java | 38 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../cloudstack/ldap/spring-ldap-context.xml | 3 +-
.../api/command/LinkDomainToLdapCmd.java | 115 +
.../api/response/LinkDomainToLdapResponse.java | 78 +
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 104 +
.../cloudstack/ldap/LdapAuthenticator.java | 78 +-
.../cloudstack/ldap/LdapConfiguration.java | 39 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 11 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 73 +-
.../apache/cloudstack/ldap/LdapTrustMapVO.java | 115 +
.../org/apache/cloudstack/ldap/LdapUser.java | 9 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 239 +-
.../cloudstack/ldap/LdapUserManagerFactory.java | 64 +
.../ldap/OpenLdapUserManagerImpl.java | 303 ++
.../cloudstack/ldap/dao/LdapTrustMapDao.java | 27 +
.../ldap/dao/LdapTrustMapDaoImpl.java | 48 +
.../ldap/ADLdapUserManagerImplSpec.groovy | 85 +
.../ldap/LdapAuthenticatorSpec.groovy | 248 +-
.../ldap/LdapConfigurationSpec.groovy | 102 +-
.../ldap/LdapContextFactorySpec.groovy | 2 +-
.../ldap/LdapCreateAccountCmdSpec.groovy | 12 +-
.../ldap/LdapImportUsersCmdSpec.groovy | 26 +-
.../cloudstack/ldap/LdapListUsersCmdSpec.groovy | 6 +-
.../cloudstack/ldap/LdapManagerImplSpec.groovy | 284 +-
.../ldap/LdapSearchUserCmdSpec.groovy | 2 +-
.../ldap/LdapUserManagerFactorySpec.groovy | 57 +
.../cloudstack/ldap/LdapUserManagerSpec.groovy | 336 --
.../cloudstack/ldap/LdapUserResponseSpec.groovy | 2 +-
.../apache/cloudstack/ldap/LdapUserSpec.groovy | 22 +-
.../ldap/LinkDomainToLdapCmdSpec.groovy | 232 ++
.../ldap/OpenLdapUserManagerSpec.groovy | 337 ++
.../command/GetServiceProviderMetaDataCmd.java | 16 +-
.../command/ListAndSwitchSAMLAccountCmd.java | 206 ++
.../cloudstack/api/command/ListIdpsCmd.java | 2 +-
.../command/SAML2LoginAPIAuthenticatorCmd.java | 54 +-
.../command/SAML2LogoutAPIAuthenticatorCmd.java | 3 +
.../api/response/SamlUserAccountResponse.java | 99 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 32 +-
.../cloudstack/saml/SAML2UserAuthenticator.java | 22 +-
.../org/apache/cloudstack/saml/SAMLUtils.java | 18 +
.../cloudstack/SAML2AuthManagerImplTest.java | 174 +
.../ListAndSwitchSAMLAccountCmdTest.java | 202 ++
.../SAML2LoginAPIAuthenticatorCmdTest.java | 9 +-
.../saml/SAML2AuthManagerImplTest.java | 75 +
pom.xml | 175 +-
python/lib/cloud_utils.py | 19 -
python/lib/cloudutils/serviceConfig.py | 7 +-
python/lib/cloudutils/utilities.py | 2 +-
scripts/storage/qcow2/managesnapshot.sh | 18 +-
.../storage/secondary/cloud-install-sys-tmplt | 123 +-
scripts/vm/hypervisor/kvm/setup-cgroups.sh | 56 -
scripts/vm/hypervisor/xenserver/cloudlog | 2 +-
scripts/vm/network/security_group.py | 16 +-
scripts/vm/systemvm/injectkeys.sh | 14 +-
server/src/com/cloud/api/ApiResponseHelper.java | 56 +-
server/src/com/cloud/api/ApiServlet.java | 8 +-
.../com/cloud/api/query/QueryManagerImpl.java | 17 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 27 +-
server/src/com/cloud/configuration/Config.java | 2 +-
.../configuration/ConfigurationManagerImpl.java | 7 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 26 +-
.../deploy/DeploymentPlanningManagerImpl.java | 21 +-
.../cloud/ha/HighAvailabilityManagerImpl.java | 177 +-
server/src/com/cloud/ha/KVMFencer.java | 26 +-
.../ha/ManagementIPSystemVMInvestigator.java | 4 +-
server/src/com/cloud/ha/RecreatableFencer.java | 2 +-
.../com/cloud/ha/UserVmDomRInvestigator.java | 4 +-
.../cloud/hypervisor/HypervisorGuruBase.java | 10 +-
.../network/ExternalDeviceUsageManagerImpl.java | 9 +-
.../ExternalFirewallDeviceManagerImpl.java | 5 +-
.../network/ExternalIpAddressAllocator.java | 16 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 15 +-
.../com/cloud/network/IpAddressManagerImpl.java | 50 +-
.../src/com/cloud/network/NetworkModelImpl.java | 25 +-
.../com/cloud/network/NetworkServiceImpl.java | 90 +-
.../element/CloudZonesNetworkElement.java | 4 +-
.../cloud/network/guru/ControlNetworkGuru.java | 15 +-
.../cloud/network/guru/DirectNetworkGuru.java | 57 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 39 +-
.../network/guru/ExternalGuestNetworkGuru.java | 45 +-
.../cloud/network/guru/GuestNetworkGuru.java | 26 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 10 +-
.../cloud/network/guru/PrivateNetworkGuru.java | 32 +-
.../cloud/network/guru/PublicNetworkGuru.java | 35 +-
.../cloud/network/guru/StorageNetworkGuru.java | 10 +-
.../lb/LoadBalancingRulesManagerImpl.java | 17 +-
.../network/router/CommandSetupHelper.java | 28 +-
.../cloud/network/router/NetworkHelperImpl.java | 78 +-
.../network/router/NicProfileHelperImpl.java | 12 +-
.../network/router/RouterControlHelper.java | 2 +-
.../router/VirtualNetworkApplianceManager.java | 3 -
.../VirtualNetworkApplianceManagerImpl.java | 92 +-
.../network/router/VpcNetworkHelperImpl.java | 27 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 26 +-
.../com/cloud/network/rules/DhcpPvlanRules.java | 2 +-
.../cloud/network/rules/DhcpSubNetRules.java | 8 +-
.../cloud/network/rules/NicPlugInOutRules.java | 14 +-
.../network/rules/PrivateGatewayRules.java | 2 +-
.../cloud/network/rules/RulesManagerImpl.java | 17 +-
.../security/SecurityGroupManagerImpl.java | 17 +-
.../cloud/server/ConfigurationServerImpl.java | 14 +-
.../com/cloud/server/ManagementServerImpl.java | 20 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 2 +
.../src/com/cloud/storage/StorageManager.java | 3 +-
.../com/cloud/storage/StorageManagerImpl.java | 3 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +
.../storage/snapshot/SnapshotManagerImpl.java | 83 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 3 +-
.../com/cloud/template/TemplateManagerImpl.java | 65 +-
.../src/com/cloud/user/AccountManagerImpl.java | 12 +-
.../src/com/cloud/vm/SystemVmLoadScanner.java | 1 +
server/src/com/cloud/vm/UserVmManager.java | 3 +
server/src/com/cloud/vm/UserVmManagerImpl.java | 67 +-
.../cloudstack/region/RegionsApiUtil.java | 10 +-
.../query/dao/SecurityGroupJoinDaoImplTest.java | 205 ++
.../ha/HighAvailabilityManagerImplTest.java | 138 +-
server/test/com/cloud/ha/KVMFencerTest.java | 22 +
.../network/router/RouterControlHelperTest.java | 6 +-
.../cloud/server/ManagementServerImplTest.java | 55 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 28 +
.../storage/snapshot/SnapshotManagerTest.java | 282 ++
.../cloud/template/TemplateManagerImplTest.java | 520 ++-
.../com/cloud/user/AccountManagerImplTest.java | 43 +
server/test/com/cloud/vpc/VpcApiUnitTest.java | 86 +-
.../CreateNetworkOfferingTest.java | 39 +-
.../console-proxy-rdp/rdpconsole/README.txt | 2 +-
.../java/common/BufferedImagePixelsAdapter.java | 8 +-
.../rdpconsole/src/main/java/common/Client.java | 2 +-
.../main/java/streamer/InputStreamSource.java | 7 +
.../main/java/streamer/OutputStreamSink.java | 7 +
.../main/java/streamer/SocketWrapperImpl.java | 39 +-
.../src/main/java/streamer/SyncLink.java | 26 +-
.../main/java/streamer/apr/AprSocketSink.java | 4 +
.../main/java/streamer/apr/AprSocketSource.java | 4 +
.../java/streamer/apr/AprSocketWrapperImpl.java | 8 +
.../java/streamer/bco/BcoSocketWrapperImpl.java | 10 +
.../main/java/streamer/debug/FakeSource.java | 4 +
.../main/java/streamer/debug/MockServer.java | 11 +-
.../src/test/java/rdpclient/MockServerTest.java | 3 +-
.../consoleproxy/ConsoleProxyAjaxHandler.java | 7 +-
.../consoleproxy/ConsoleProxyClientBase.java | 14 +-
.../consoleproxy/ConsoleProxyGCThread.java | 5 +-
.../rdp/RdpBufferedImageCanvas.java | 4 +
.../consoleproxy/vnc/BufferedImageCanvas.java | 8 +-
.../com/cloud/consoleproxy/vnc/VncClient.java | 16 +-
.../consoleproxy/vnc/packet/server/RawRect.java | 33 +-
.../SecondaryStorageManagerImpl.java | 26 +-
.../resource/NfsSecondaryStorageResource.java | 6 +-
.../storage/template/DownloadManagerImpl.java | 87 +-
setup/db/db/schema-421to430.sql | 3 +-
setup/db/db/schema-451to452.sql | 4 +
setup/db/db/schema-452to460-cleanup.sql | 5 +-
setup/db/db/schema-452to460.sql | 15 +
setup/dev/advanced.cfg | 4 +
supervisord.conf | 15 -
.../debian/config/etc/init.d/cloud-early-config | 4 +
.../debian/config/etc/iptables/iptables-router | 2 +-
.../config/etc/iptables/iptables-vpcrouter | 2 +-
.../debian/config/opt/cloud/bin/configure.py | 200 +-
.../debian/config/opt/cloud/bin/cs/CsAddress.py | 224 +-
.../debian/config/opt/cloud/bin/cs/CsDatabag.py | 15 +-
.../debian/config/opt/cloud/bin/cs/CsFile.py | 34 +-
.../debian/config/opt/cloud/bin/cs/CsHelper.py | 15 +-
.../config/opt/cloud/bin/cs/CsRedundant.py | 73 +-
.../debian/config/opt/cloud/bin/cs/CsRoute.py | 64 +-
.../config/opt/cloud/bin/cs_remoteaccessvpn.py | 28 +
.../debian/config/opt/cloud/bin/cs_vpnusers.py | 48 +
.../debian/config/opt/cloud/bin/master.py | 2 +-
.../debian/config/opt/cloud/bin/merge.py | 16 +
.../config/opt/cloud/bin/update_config.py | 2 +-
systemvm/test/python/TestCsRoute.py | 17 +-
test/integration/component/maint/test_bugs.py | 2 +-
.../maint/test_escalation_templates.py | 407 +++
.../component/maint/test_hypervisor_limit.py | 225 ++
.../component/maint/test_multiple_ip_ranges.py | 4 +-
.../test_zone_level_local_storage_setting.py | 20 +-
.../maint/testpath_disablestoragepool.py | 1037 ++++--
.../component/test_add_remove_network.py | 118 +-
.../component/test_browse_templates.py | 36 +
.../component/test_browse_templates2.py | 212 ++
.../component/test_browse_volumes.py | 28 +
.../test_escalation_listTemplateDomainAdmin.py | 1 -
.../component/test_escalations_ipaddresses.py | 4 +-
.../component/test_escalations_routers.py | 196 ++
.../component/test_escalations_templates.py | 267 +-
.../component/test_escalations_vmware.py | 67 +-
.../component/test_interop_xd_ccp.py | 21 +-
test/integration/component/test_ldap.py | 2 +-
.../test_routers_iptables_default_policy.py | 649 ++++
.../component/test_security_groups.py | 243 +-
.../component/test_ss_domain_limits.py | 4 +-
.../component/test_vpc_router_nics.py | 449 +++
test/integration/smoke/test_affinity_groups.py | 2 +-
.../smoke/test_deploy_vgpu_enabled_vm.py | 8 +-
.../smoke/test_deploy_vm_with_userdata.py | 4 +-
...deploy_vms_with_varied_deploymentplanners.py | 6 +-
test/integration/smoke/test_internal_lb.py | 2 +-
test/integration/smoke/test_iso.py | 17 +-
test/integration/smoke/test_loadbalance.py | 2 +-
test/integration/smoke/test_network.py | 10 +-
test/integration/smoke/test_network_acl.py | 2 +-
.../integration/smoke/test_nicira_controller.py | 310 ++
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_scale_vm.py | 74 +-
.../integration/smoke/test_service_offerings.py | 20 +-
test/integration/smoke/test_snapshots.py | 142 +-
test/integration/smoke/test_templates.py | 89 +-
test/integration/smoke/test_vm_life_cycle.py | 6 +-
test/integration/smoke/test_vm_snapshots.py | 6 +-
test/integration/smoke/test_volumes.py | 4 +-
test/integration/smoke/test_vpc_vpn.py | 4 +-
.../testpaths/testpath_attach_disk_zwps.py | 209 ++
.../testpaths/testpath_multiple_snapshot.py | 290 ++
.../testpaths/testpath_queryAsyncJobResult.py | 133 +
.../testpaths/testpath_revert_snap.py | 161 +
.../testpaths/testpath_same_vm_name.py | 23 +-
.../testpaths/testpath_snapshot_limits.py | 1 -
test/integration/testpaths/testpath_usage.py | 94 +-
.../testpaths/testpath_uuid_event.py | 196 ++
.../com/cloud/test/regression/ApiCommand.java | 1 +
.../test/stress/StressTestDirectAttach.java | 3 +
.../cloud/test/stress/TestClientWithAPI.java | 3 +
.../src/com/cloud/test/ui/AddAndDeleteAISO.java | 6 +
.../cloud/test/ui/AddAndDeleteATemplate.java | 6 +
test/src/com/cloud/test/ui/UIScenarioTest.java | 4 +
test/src/com/cloud/test/utils/ConsoleProxy.java | 2 +-
.../com/cloud/test/utils/IpSqlGenerator.java | 3 +-
.../com/cloud/test/utils/SqlDataGenerator.java | 3 +-
test/src/com/cloud/test/utils/TestClient.java | 2 +
.../install_systemvm_packages.sh | 2 +-
tools/build/build_asf.sh | 5 +
tools/docker/Dockerfile | 59 +
tools/docker/Dockerfile.centos6 | 50 +
tools/docker/Dockerfile.marvin | 40 +
tools/docker/README.md | 100 +
tools/docker/init.sh_centos6 | 50 +
tools/docker/supervisord.conf | 15 +
tools/git/git-fwd-merge | 56 +
tools/git/git-pr | 235 ++
tools/marvin/marvin/cloudstackTestCase.py | 4 +
tools/marvin/marvin/codes.py | 2 +-
tools/marvin/marvin/config/test_data.py | 69 +-
tools/marvin/marvin/deployDataCenter.py | 112 +-
tools/marvin/marvin/lib/base.py | 62 +
tools/marvin/marvin/lib/utils.py | 75 +-
ui/css/cloudstack3.css | 16 +-
ui/css/custom.css | 21 +
ui/dictionary.jsp | 2 +
ui/dictionary2.jsp | 65 +-
ui/index.jsp | 11 +-
ui/scripts/accounts.js | 160 +-
ui/scripts/accountsWizard.js | 14 +-
ui/scripts/affinity.js | 12 +-
ui/scripts/autoscaler.js | 8 +-
ui/scripts/cloud.core.callbacks.js | 6 +-
ui/scripts/cloudStack.js | 29 +-
ui/scripts/configuration.js | 58 +-
ui/scripts/dashboard.js | 56 +-
ui/scripts/docs.js | 11 +
ui/scripts/domains.js | 146 +-
ui/scripts/events.js | 24 +-
ui/scripts/globalSettings.js | 94 +-
ui/scripts/instanceWizard.js | 424 +--
ui/scripts/instances.js | 558 ++--
ui/scripts/lbStickyPolicy.js | 6 +-
ui/scripts/network.js | 1201 +++----
ui/scripts/projects.js | 64 +-
ui/scripts/regions.js | 42 +-
ui/scripts/sharedFunctions.js | 192 +-
ui/scripts/storage.js | 288 +-
ui/scripts/system.js | 2936 ++++++++---------
ui/scripts/templates.js | 784 ++---
ui/scripts/ui-custom/accountsWizard.js | 168 +-
ui/scripts/ui-custom/autoscaler.js | 2 +-
ui/scripts/ui-custom/healthCheck.js | 8 +-
ui/scripts/ui-custom/instanceWizard.js | 40 +-
ui/scripts/ui-custom/login.js | 8 +-
ui/scripts/ui-custom/physicalResources.js | 2 +-
ui/scripts/ui-custom/pluginListing.js | 4 +-
ui/scripts/ui-custom/projects.js | 2 +-
ui/scripts/ui-custom/regions.js | 4 -
ui/scripts/ui-custom/saml.js | 96 +
ui/scripts/ui-custom/zoneChart.js | 4 +-
ui/scripts/ui-custom/zoneWizard.js | 184 +-
ui/scripts/ui/core.js | 4 +-
ui/scripts/ui/dialog.js | 40 +-
ui/scripts/ui/utils.js | 2 +-
ui/scripts/ui/widgets/detailView.js | 90 +-
ui/scripts/ui/widgets/listView.js | 56 +-
ui/scripts/ui/widgets/multiEdit.js | 20 +-
ui/scripts/vpc.js | 154 +-
ui/scripts/zoneWizard.js | 770 ++---
usage/src/com/cloud/usage/UsageServer.java | 2 +
utils/certs/cloud.keystore | Bin 1316 -> 0 bytes
utils/pom.xml | 44 +-
utils/src/com/cloud/maint/Version.java | 77 -
utils/src/com/cloud/utils/ActionDelegate.java | 24 -
.../com/cloud/utils/CloudResourceBundle.java | 48 -
.../com/cloud/utils/ConstantTimeComparator.java | 42 -
utils/src/com/cloud/utils/DateUtil.java | 300 --
utils/src/com/cloud/utils/EncryptionUtil.java | 73 -
utils/src/com/cloud/utils/EnumUtils.java | 58 -
utils/src/com/cloud/utils/ExecutionResult.java | 46 -
utils/src/com/cloud/utils/FileUtil.java | 32 -
utils/src/com/cloud/utils/HttpUtils.java | 92 -
utils/src/com/cloud/utils/IteratorUtil.java | 72 -
utils/src/com/cloud/utils/Journal.java | 104 -
utils/src/com/cloud/utils/LogUtils.java | 45 -
utils/src/com/cloud/utils/MethodCapturer.java | 113 -
utils/src/com/cloud/utils/NumbersUtil.java | 139 -
utils/src/com/cloud/utils/Pair.java | 87 -
.../src/com/cloud/utils/PasswordGenerator.java | 90 -
utils/src/com/cloud/utils/Predicate.java | 24 -
utils/src/com/cloud/utils/ProcessUtil.java | 112 -
utils/src/com/cloud/utils/Profiler.java | 91 -
utils/src/com/cloud/utils/PropertiesUtil.java | 196 --
utils/src/com/cloud/utils/ReflectUtil.java | 213 --
utils/src/com/cloud/utils/ReflectionUse.java | 31 -
utils/src/com/cloud/utils/S3Utils.java | 596 ----
utils/src/com/cloud/utils/SerialVersionUID.java | 69 -
utils/src/com/cloud/utils/StringUtils.java | 315 --
utils/src/com/cloud/utils/SwiftUtil.java | 239 --
utils/src/com/cloud/utils/Ternary.java | 85 -
utils/src/com/cloud/utils/UriUtils.java | 394 ---
.../cloud/utils/UsernamePasswordValidator.java | 49 -
utils/src/com/cloud/utils/UuidUtils.java | 34 -
.../cloud/utils/backoff/BackoffAlgorithm.java | 38 -
.../utils/backoff/impl/ConstantTimeBackoff.java | 102 -
.../backoff/impl/ConstantTimeBackoffMBean.java | 35 -
.../utils/cisco/n1kv/vsm/NetconfHelper.java | 355 --
.../cloud/utils/cisco/n1kv/vsm/PolicyMap.java | 34 -
.../cloud/utils/cisco/n1kv/vsm/PortProfile.java | 48 -
.../cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 999 ------
.../utils/cisco/n1kv/vsm/VsmOkResponse.java | 44 -
.../cisco/n1kv/vsm/VsmPolicyMapResponse.java | 84 -
.../cisco/n1kv/vsm/VsmPortProfileResponse.java | 166 -
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 222 --
.../src/com/cloud/utils/component/Adapter.java | 27 -
.../com/cloud/utils/component/AdapterBase.java | 40 -
.../com/cloud/utils/component/AdapterList.java | 37 -
.../cloud/utils/component/ComponentContext.java | 282 --
.../ComponentInstantiationPostProcessor.java | 149 -
.../utils/component/ComponentLifecycle.java | 64 -
.../utils/component/ComponentLifecycleBase.java | 87 -
.../component/ComponentMethodInterceptable.java | 27 -
.../component/ComponentMethodInterceptor.java | 32 -
.../utils/component/ComponentNamingPolicy.java | 65 -
.../src/com/cloud/utils/component/Manager.java | 27 -
.../com/cloud/utils/component/ManagerBase.java | 28 -
utils/src/com/cloud/utils/component/Named.java | 26 -
.../cloud/utils/component/PluggableService.java | 29 -
.../src/com/cloud/utils/component/Registry.java | 51 -
.../utils/component/SystemIntegrityChecker.java | 30 -
.../utils/concurrency/NamedThreadFactory.java | 38 -
.../com/cloud/utils/concurrency/Scheduler.java | 31 -
.../utils/concurrency/SynchronizationEvent.java | 89 -
.../com/cloud/utils/concurrency/TestClock.java | 161 -
.../com/cloud/utils/crypt/DBEncryptionUtil.java | 87 -
.../utils/crypt/EncryptionSecretKeyChecker.java | 156 -
.../utils/crypt/EncryptionSecretKeySender.java | 65 -
utils/src/com/cloud/utils/crypt/RSAHelper.java | 86 -
utils/src/com/cloud/utils/db/DbProperties.java | 109 -
utils/src/com/cloud/utils/db/EntityManager.java | 84 -
utils/src/com/cloud/utils/db/UUIDManager.java | 48 -
.../com/cloud/utils/encoding/URLEncoder.java | 113 -
utils/src/com/cloud/utils/events/EventArgs.java | 44 -
.../com/cloud/utils/events/SubscriptionMgr.java | 164 -
.../utils/exception/CSExceptionErrorCode.java | 99 -
.../utils/exception/CloudRuntimeException.java | 141 -
.../com/cloud/utils/exception/ErrorContext.java | 31 -
.../utils/exception/ExceptionProxyObject.java | 55 -
.../cloud/utils/exception/ExceptionUtil.java | 54 -
.../utils/exception/ExecutionException.java | 49 -
.../HypervisorVersionChangedException.java | 35 -
utils/src/com/cloud/utils/fsm/ChangeEvent.java | 24 -
utils/src/com/cloud/utils/fsm/FiniteState.java | 58 -
utils/src/com/cloud/utils/fsm/FiniteState2.java | 34 -
.../com/cloud/utils/fsm/FiniteStateObject.java | 25 -
.../cloud/utils/fsm/NoTransitionException.java | 36 -
utils/src/com/cloud/utils/fsm/State.java | 27 -
utils/src/com/cloud/utils/fsm/StateDao.java | 25 -
.../src/com/cloud/utils/fsm/StateListener.java | 43 -
utils/src/com/cloud/utils/fsm/StateMachine.java | 147 -
.../src/com/cloud/utils/fsm/StateMachine2.java | 261 --
utils/src/com/cloud/utils/fsm/StateObject.java | 27 -
.../cloud/utils/log/CglibThrowableRenderer.java | 84 -
utils/src/com/cloud/utils/mgmt/JmxUtil.java | 90 -
.../com/cloud/utils/mgmt/ManagementBean.java | 27 -
.../utils/mgmt/PropertyMapDynamicBean.java | 120 -
utils/src/com/cloud/utils/net/Ip.java | 98 -
utils/src/com/cloud/utils/net/Ip4Address.java | 80 -
utils/src/com/cloud/utils/net/MacAddress.java | 382 ---
utils/src/com/cloud/utils/net/NetUtils.java | 1550 ---------
utils/src/com/cloud/utils/net/NfsUtils.java | 55 -
utils/src/com/cloud/utils/net/UrlUtil.java | 63 -
.../src/com/cloud/utils/nio/HandlerFactory.java | 28 -
utils/src/com/cloud/utils/nio/Link.java | 567 ----
utils/src/com/cloud/utils/nio/NioClient.java | 125 -
.../src/com/cloud/utils/nio/NioConnection.java | 475 ---
utils/src/com/cloud/utils/nio/NioServer.java | 97 -
utils/src/com/cloud/utils/nio/Task.java | 89 -
.../com/cloud/utils/nio/TrustAllManager.java | 45 -
.../BasicEncodedRESTValidationStrategy.java | 66 -
.../utils/rest/CloudstackRESTException.java | 39 -
.../cloud/utils/rest/RESTServiceConnector.java | 395 ---
.../utils/rest/RESTValidationStrategy.java | 165 -
.../cloud/utils/script/OutputInterpreter.java | 139 -
utils/src/com/cloud/utils/script/Script.java | 502 ---
utils/src/com/cloud/utils/script/Script2.java | 70 -
.../cloud/utils/security/CertificateHelper.java | 166 -
utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 179 -
.../src/com/cloud/utils/ssh/SSHKeysHelper.java | 115 -
utils/src/com/cloud/utils/ssh/SshException.java | 30 -
utils/src/com/cloud/utils/ssh/SshHelper.java | 209 --
.../storage/encoding/DecodedDataObject.java | 56 -
.../storage/encoding/DecodedDataStore.java | 68 -
.../cloud/utils/storage/encoding/Decoder.java | 62 -
.../utils/storage/encoding/EncodingType.java | 32 -
.../com/cloud/utils/time/InaccurateClock.java | 105 -
.../cloud/utils/time/InaccurateClockMBean.java | 28 -
.../com/cloud/utils/xmlobject/XmlObject.java | 214 --
.../cloud/utils/xmlobject/XmlObjectParser.java | 128 -
.../src/main/java/com/cloud/maint/Version.java | 77 +
.../java/com/cloud/utils/ActionDelegate.java | 24 +
.../java/com/cloud/utils/AutoCloseableUtil.java | 36 +
.../com/cloud/utils/CloudResourceBundle.java | 48 +
.../com/cloud/utils/ConstantTimeComparator.java | 42 +
.../src/main/java/com/cloud/utils/DateUtil.java | 274 ++
.../java/com/cloud/utils/EncryptionUtil.java | 73 +
.../main/java/com/cloud/utils/EnumUtils.java | 58 +
.../java/com/cloud/utils/ExecutionResult.java | 46 +
.../src/main/java/com/cloud/utils/FileUtil.java | 32 +
.../main/java/com/cloud/utils/HttpUtils.java | 114 +
.../main/java/com/cloud/utils/IteratorUtil.java | 72 +
.../src/main/java/com/cloud/utils/Journal.java | 104 +
.../src/main/java/com/cloud/utils/LogUtils.java | 45 +
.../java/com/cloud/utils/MethodCapturer.java | 113 +
.../main/java/com/cloud/utils/NumbersUtil.java | 139 +
utils/src/main/java/com/cloud/utils/Pair.java | 87 +
.../java/com/cloud/utils/PasswordGenerator.java | 90 +
.../main/java/com/cloud/utils/Predicate.java | 24 +
.../main/java/com/cloud/utils/ProcessUtil.java | 112 +
.../src/main/java/com/cloud/utils/Profiler.java | 91 +
.../java/com/cloud/utils/PropertiesUtil.java | 196 ++
.../main/java/com/cloud/utils/ReflectUtil.java | 213 ++
.../java/com/cloud/utils/ReflectionUse.java | 31 +
.../src/main/java/com/cloud/utils/S3Utils.java | 619 ++++
.../java/com/cloud/utils/SerialVersionUID.java | 71 +
.../main/java/com/cloud/utils/StringUtils.java | 323 ++
.../main/java/com/cloud/utils/SwiftUtil.java | 239 ++
.../src/main/java/com/cloud/utils/Ternary.java | 85 +
.../src/main/java/com/cloud/utils/UriUtils.java | 394 +++
.../cloud/utils/UsernamePasswordValidator.java | 49 +
.../main/java/com/cloud/utils/UuidUtils.java | 34 +
.../cloud/utils/backoff/BackoffAlgorithm.java | 38 +
.../utils/backoff/impl/ConstantTimeBackoff.java | 102 +
.../backoff/impl/ConstantTimeBackoffMBean.java | 35 +
.../utils/cisco/n1kv/vsm/NetconfHelper.java | 355 ++
.../cloud/utils/cisco/n1kv/vsm/PolicyMap.java | 34 +
.../cloud/utils/cisco/n1kv/vsm/PortProfile.java | 48 +
.../cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 999 ++++++
.../utils/cisco/n1kv/vsm/VsmOkResponse.java | 44 +
.../cisco/n1kv/vsm/VsmPolicyMapResponse.java | 84 +
.../cisco/n1kv/vsm/VsmPortProfileResponse.java | 166 +
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 222 ++
.../java/com/cloud/utils/component/Adapter.java | 27 +
.../com/cloud/utils/component/AdapterBase.java | 40 +
.../com/cloud/utils/component/AdapterList.java | 37 +
.../cloud/utils/component/ComponentContext.java | 282 ++
.../ComponentInstantiationPostProcessor.java | 149 +
.../utils/component/ComponentLifecycle.java | 64 +
.../utils/component/ComponentLifecycleBase.java | 87 +
.../component/ComponentMethodInterceptable.java | 27 +
.../component/ComponentMethodInterceptor.java | 32 +
.../utils/component/ComponentNamingPolicy.java | 65 +
.../java/com/cloud/utils/component/Manager.java | 27 +
.../com/cloud/utils/component/ManagerBase.java | 28 +
.../java/com/cloud/utils/component/Named.java | 26 +
.../cloud/utils/component/PluggableService.java | 29 +
.../com/cloud/utils/component/Registry.java | 51 +
.../utils/component/SystemIntegrityChecker.java | 30 +
.../utils/concurrency/NamedThreadFactory.java | 38 +
.../com/cloud/utils/concurrency/Scheduler.java | 31 +
.../utils/concurrency/SynchronizationEvent.java | 89 +
.../com/cloud/utils/concurrency/TestClock.java | 161 +
.../com/cloud/utils/crypt/DBEncryptionUtil.java | 87 +
.../utils/crypt/EncryptionSecretKeyChecker.java | 146 +
.../utils/crypt/EncryptionSecretKeySender.java | 65 +
.../java/com/cloud/utils/crypt/RSAHelper.java | 90 +
.../java/com/cloud/utils/db/DbProperties.java | 109 +
.../java/com/cloud/utils/db/EntityManager.java | 84 +
.../java/com/cloud/utils/db/UUIDManager.java | 48 +
.../com/cloud/utils/encoding/URLEncoder.java | 113 +
.../java/com/cloud/utils/events/EventArgs.java | 44 +
.../com/cloud/utils/events/SubscriptionMgr.java | 164 +
.../utils/exception/CSExceptionErrorCode.java | 100 +
.../utils/exception/CloudRuntimeException.java | 141 +
.../com/cloud/utils/exception/ErrorContext.java | 31 +
.../utils/exception/ExceptionProxyObject.java | 55 +
.../cloud/utils/exception/ExceptionUtil.java | 54 +
.../utils/exception/ExecutionException.java | 49 +
.../HypervisorVersionChangedException.java | 35 +
.../utils/exception/NioConnectionException.java | 48 +
.../utils/exception/TaskExecutionException.java | 48 +
.../java/com/cloud/utils/fsm/ChangeEvent.java | 24 +
.../java/com/cloud/utils/fsm/FiniteState.java | 58 +
.../java/com/cloud/utils/fsm/FiniteState2.java | 34 +
.../com/cloud/utils/fsm/FiniteStateObject.java | 25 +
.../cloud/utils/fsm/NoTransitionException.java | 36 +
.../main/java/com/cloud/utils/fsm/State.java | 27 +
.../main/java/com/cloud/utils/fsm/StateDao.java | 25 +
.../java/com/cloud/utils/fsm/StateListener.java | 43 +
.../java/com/cloud/utils/fsm/StateMachine.java | 147 +
.../java/com/cloud/utils/fsm/StateMachine2.java | 261 ++
.../java/com/cloud/utils/fsm/StateObject.java | 27 +
.../cloud/utils/log/CglibThrowableRenderer.java | 82 +
.../main/java/com/cloud/utils/mgmt/JmxUtil.java | 90 +
.../com/cloud/utils/mgmt/ManagementBean.java | 27 +
.../utils/mgmt/PropertyMapDynamicBean.java | 120 +
utils/src/main/java/com/cloud/utils/net/Ip.java | 98 +
.../java/com/cloud/utils/net/Ip4Address.java | 80 +
.../java/com/cloud/utils/net/MacAddress.java | 367 +++
.../main/java/com/cloud/utils/net/NetUtils.java | 1550 +++++++++
.../main/java/com/cloud/utils/net/NfsUtils.java | 55 +
.../main/java/com/cloud/utils/net/UrlUtil.java | 63 +
.../com/cloud/utils/nio/HandlerFactory.java | 28 +
.../src/main/java/com/cloud/utils/nio/Link.java | 567 ++++
.../java/com/cloud/utils/nio/NioClient.java | 121 +
.../java/com/cloud/utils/nio/NioConnection.java | 500 +++
.../java/com/cloud/utils/nio/NioServer.java | 97 +
.../src/main/java/com/cloud/utils/nio/Task.java | 86 +
.../com/cloud/utils/nio/TrustAllManager.java | 45 +
.../com/cloud/utils/rest/BasicRestClient.java | 118 +
.../utils/rest/CloudstackRESTException.java | 33 +
.../com/cloud/utils/rest/HttpClientHelper.java | 71 +
.../com/cloud/utils/rest/HttpConstants.java | 34 +
.../java/com/cloud/utils/rest/HttpMethods.java | 41 +
.../cloud/utils/rest/HttpStatusCodeHelper.java | 34 +
.../cloud/utils/rest/HttpUriRequestBuilder.java | 119 +
.../cloud/utils/rest/RESTServiceConnector.java | 166 +
.../java/com/cloud/utils/rest/RestClient.java | 31 +
.../cloud/utils/script/OutputInterpreter.java | 141 +
.../java/com/cloud/utils/script/Script.java | 502 +++
.../java/com/cloud/utils/script/Script2.java | 70 +
.../cloud/utils/security/CertificateHelper.java | 166 +
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 179 +
.../java/com/cloud/utils/ssh/SSHKeysHelper.java | 115 +
.../java/com/cloud/utils/ssh/SshException.java | 30 +
.../java/com/cloud/utils/ssh/SshHelper.java | 209 ++
.../com/cloud/utils/storage/QCOW2Utils.java | 60 +
.../storage/encoding/DecodedDataObject.java | 56 +
.../storage/encoding/DecodedDataStore.java | 68 +
.../cloud/utils/storage/encoding/Decoder.java | 66 +
.../utils/storage/encoding/EncodingType.java | 32 +
.../com/cloud/utils/time/InaccurateClock.java | 102 +
.../cloud/utils/time/InaccurateClockMBean.java | 28 +
.../com/cloud/utils/xmlobject/XmlObject.java | 214 ++
.../cloud/utils/xmlobject/XmlObjectParser.java | 128 +
.../utils/baremetal/BaremetalUtils.java | 24 +
.../utils/graphite/GraphiteClient.java | 123 +
.../utils/graphite/GraphiteException.java | 31 +
.../utils/hypervisor/HypervisorUtils.java | 68 +
.../utils/identity/ManagementServerNode.java | 63 +
.../utils/imagestore/ImageStoreUtil.java | 110 +
.../cloudstack/utils/security/SSLUtils.java | 58 +
.../utils/security/SecureSSLSocketFactory.java | 124 +
.../cloudstack/utils/usage/UsageUtils.java | 24 +
.../ssl/EasySSLProtocolSocketFactory.java | 210 ++
.../contrib/ssl/EasyX509TrustManager.java | 110 +
utils/src/main/resources/cloud.keystore | Bin 0 -> 1316 bytes
.../utils/baremetal/BaremetalUtils.java | 24 -
.../utils/graphite/GraphiteClient.java | 123 -
.../utils/graphite/GraphiteException.java | 31 -
.../utils/identity/ManagementServerNode.java | 63 -
.../utils/imagestore/ImageStoreUtil.java | 110 -
.../cloudstack/utils/security/SSLUtils.java | 58 -
.../utils/security/SecureSSLSocketFactory.java | 124 -
.../cloudstack/utils/usage/UsageUtils.java | 24 -
.../ssl/EasySSLProtocolSocketFactory.java | 210 --
.../contrib/ssl/EasyX509TrustManager.java | 110 -
.../test/java/com/cloud/utils/DateUtilTest.java | 60 +
.../test/java/com/cloud/utils/DummyImpl.java | 31 +
.../java/com/cloud/utils/DummyInterface.java | 24 +
.../java/com/cloud/utils/DummyPremiumImpl.java | 28 +
.../java/com/cloud/utils/HttpUtilsTest.java | 94 +
.../java/com/cloud/utils/NumbersUtilTest.java | 47 +
.../com/cloud/utils/PasswordGeneratorTest.java | 42 +
.../java/com/cloud/utils/ProcessUtilTest.java | 76 +
.../com/cloud/utils/PropertiesUtilsTest.java | 64 +
.../java/com/cloud/utils/ReflectUtilTest.java | 148 +
.../test/java/com/cloud/utils/ScriptTest.java | 135 +
.../java/com/cloud/utils/StringUtilsTest.java | 253 ++
.../test/java/com/cloud/utils/TernaryTest.java | 34 +
.../test/java/com/cloud/utils/TestProfiler.java | 99 +
.../test/java/com/cloud/utils/UriUtilsTest.java | 60 +
.../java/com/cloud/utils/UuidUtilsTest.java | 42 +
.../backoff/impl/ConstantTimeBackoffTest.java | 112 +
.../crypto/EncryptionSecretKeyCheckerTest.java | 45 +
.../com/cloud/utils/crypto/RSAHelperTest.java | 54 +
.../cloud/utils/encoding/UrlEncoderTest.java | 33 +
.../utils/exception/ExceptionUtilTest.java | 52 +
.../utils/log/CglibThrowableRendererTest.java | 85 +
.../com/cloud/utils/net/Ip4AddressTest.java | 40 +
.../test/java/com/cloud/utils/net/IpTest.java | 63 +
.../com/cloud/utils/net/MacAddressTest.java | 60 +
.../java/com/cloud/utils/net/NetUtilsTest.java | 421 +++
.../cloud/utils/rest/BasicRestClientTest.java | 106 +
.../cloud/utils/rest/HttpClientHelperTest.java | 38 +
.../cloud/utils/rest/HttpRequestMatcher.java | 141 +
.../utils/rest/HttpStatusCodeHelperTest.java | 59 +
.../utils/rest/HttpUriRequestBuilderTest.java | 115 +
.../utils/rest/HttpUriRequestMethodMatcher.java | 44 +
.../utils/rest/HttpUriRequestPathMatcher.java | 43 +
.../rest/HttpUriRequestPayloadMatcher.java | 62 +
.../utils/rest/HttpUriRequestQueryMatcher.java | 48 +
.../utils/rest/RESTServiceConnectorTest.java | 323 ++
.../com/cloud/utils/ssh/SSHKeysHelperTest.java | 73 +
.../utils/testcase/Log4jEnabledTestCase.java | 58 +
.../java/com/cloud/utils/testcase/NioTest.java | 225 ++
.../cloud/utils/xmlobject/TestXmlObject.java | 53 +
.../cloud/utils/xmlobject/TestXmlObject2.java | 54 +
.../utils/hypervisor/HypervisorUtilsTest.java | 111 +
.../utils/imagestore/ImageStoreUtilTest.java | 54 +
.../com/cloud/utils/QualifierTestContext.xml | 38 +
.../utils/db/transactionContextBuilderTest.xml | 48 +
utils/src/test/resources/log4j.xml | 118 +
utils/src/test/resources/testContext.xml | 52 +
utils/test/com/cloud/utils/DummyImpl.java | 31 -
utils/test/com/cloud/utils/DummyInterface.java | 24 -
.../test/com/cloud/utils/DummyPremiumImpl.java | 28 -
utils/test/com/cloud/utils/NumbersUtilTest.java | 47 -
.../com/cloud/utils/PasswordGeneratorTest.java | 42 -
utils/test/com/cloud/utils/ProcessUtilTest.java | 76 -
.../com/cloud/utils/PropertiesUtilsTest.java | 64 -
utils/test/com/cloud/utils/ReflectUtilTest.java | 148 -
utils/test/com/cloud/utils/ScriptTest.java | 135 -
utils/test/com/cloud/utils/StringUtilsTest.java | 233 --
utils/test/com/cloud/utils/TernaryTest.java | 34 -
utils/test/com/cloud/utils/TestProfiler.java | 116 -
utils/test/com/cloud/utils/UriUtilsTest.java | 60 -
utils/test/com/cloud/utils/UuidUtilsTest.java | 42 -
.../backoff/impl/ConstantTimeBackoffTest.java | 112 -
.../crypto/EncryptionSecretKeyCheckerTest.java | 45 -
.../com/cloud/utils/crypto/RSAHelperTest.java | 54 -
.../cloud/utils/encoding/UrlEncoderTest.java | 33 -
.../utils/exception/ExceptionUtilTest.java | 49 -
.../com/cloud/utils/net/Ip4AddressTest.java | 40 -
utils/test/com/cloud/utils/net/IpTest.java | 63 -
.../com/cloud/utils/net/MacAddressTest.java | 60 -
.../test/com/cloud/utils/net/NetUtilsTest.java | 421 ---
.../utils/rest/RESTServiceConnectorTest.java | 395 ---
.../com/cloud/utils/ssh/SSHKeysHelperTest.java | 73 -
.../utils/testcase/Log4jEnabledTestCase.java | 58 -
.../test/com/cloud/utils/testcase/NioTest.java | 216 --
.../cloud/utils/xmlobject/TestXmlObject.java | 53 -
.../cloud/utils/xmlobject/TestXmlObject2.java | 54 -
.../utils/imagestore/ImageStoreUtilTest.java | 54 -
.../com/cloud/utils/QualifierTestContext.xml | 38 -
.../utils/db/transactionContextBuilderTest.xml | 48 -
utils/test/resources/log4j.xml | 118 -
utils/test/resources/testContext.xml | 52 -
.../vmware/mo/HypervisorHostHelper.java | 1 +
.../vmware/mo/SnapshotDescriptor.java | 17 +-
.../com/cloud/hypervisor/vmware/mo/TaskMO.java | 5 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 23 +-
.../hypervisor/vmware/util/VmwareClient.java | 33 +-
.../hypervisor/vmware/util/VmwareContext.java | 21 +-
.../hypervisor/vmware/util/VmwareHelper.java | 3 +-
.../vmware/util/VmwareContextTest.java | 47 +
1113 files changed, 57194 insertions(+), 45686 deletions(-)
----------------------------------------------------------------------
[6/6] git commit: updated refs/heads/master to b69dff7
Posted by re...@apache.org.
Merge pull request #973 from DaanHoogland/interfacePatternCheck
CLOUDSTACK-8838 Interface pattern checkthsi closes #812 and #966 as well
* pr/973:
unit test for interface patterns in libvirt compute resource
Added support for KVM teamd devices to LibvirtComputingResource.java. This will allow users to utilze teamd nic teaming devices named team*.
CLOUDSTACK-8838: Allow ensX enoX enpX enxX format for nics in CentOS 7
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b69dff79
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b69dff79
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b69dff79
Branch: refs/heads/master
Commit: b69dff7905a1fc7a39ae951eb3fb63ac65c35bf5
Parents: 8a09f88 5a134a6
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Oct 25 21:02:57 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Oct 25 21:02:57 2015 +0100
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 35 +++++++++++++++++---
.../resource/LibvirtComputingResourceTest.java | 13 ++++++++
2 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/6] git commit: updated refs/heads/master to b69dff7
Posted by re...@apache.org.
Added support for KVM teamd devices to LibvirtComputingResource.java. This will allow users to utilze teamd nic teaming devices named team*.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1a401c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1a401c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1a401c0
Branch: refs/heads/master
Commit: e1a401c0232928109330cc4670e54b6a80a97de4
Parents: cf839bd
Author: David Mabry <dm...@ena.com>
Authored: Thu Oct 22 10:19:50 2015 -0500
Committer: David Mabry <dm...@ena.com>
Committed: Thu Oct 22 10:19:50 2015 -0500
----------------------------------------------------------------------
.../hypervisor/kvm/resource/LibvirtComputingResource.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1a401c0/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index bc57c2c..db4b9e8 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1160,13 +1160,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
for (int i = 0; i < interfaces.length; i++) {
final String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
- if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
+ if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("team") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
fname.matches("^p\\d+p\\d+.*")) {
return fname;
}
}
- s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
+ s_logger.debug("failing to get physical interface from bridge " + bridgeName + ", did not find an eth*, bond*, team*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
return "";
}
@@ -1450,7 +1450,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (!matcher.group(4).isEmpty()) {
return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString();
} else {
- //untagged or not matching (eth|bond)#.#
+ //untagged or not matching (eth|bond|team)#.#
s_logger.debug("failed to get vNet id from bridge " + brName
+ "attached to physical interface" + pif + ", perhaps untagged interface");
return "";
[5/6] git commit: updated refs/heads/master to b69dff7
Posted by re...@apache.org.
unit test for interface patterns in libvirt compute resource
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5a134a6f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5a134a6f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5a134a6f
Branch: refs/heads/master
Commit: 5a134a6fe676d4461a2b5dbcc92057e18544718e
Parents: f1ea27e
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Oct 23 17:17:40 2015 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Sat Oct 24 00:57:01 2015 +0200
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 31 ++++++++++++++++++--
.../resource/LibvirtComputingResourceTest.java | 13 ++++++++
2 files changed, 42 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a134a6f/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index ef6b827..11317af 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1160,8 +1160,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
for (int i = 0; i < interfaces.length; i++) {
final String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
- if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("team") || fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
- fname.matches("^p\\d+p\\d+.*") || fname.startsWith("ens") || fname.startsWith("eno") || fname.startsWith("enp") || fname.startsWith("enx")) {
+ if (isInterface(fname)) {
return fname;
}
}
@@ -1170,6 +1169,34 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return "";
}
+ String [] _ifNamePrefixes = {
+ "eth",
+ "bond",
+ "vlan",
+ "vx",
+ "em",
+ "ens",
+ "eno",
+ "enp",
+ "team",
+ "enx",
+ "^p\\d+p\\d+"
+ };
+ /**
+ * @param fname
+ * @return
+ */
+ boolean isInterface(final String fname) {
+ StringBuffer commonPattern = new StringBuffer();
+ for (String ifNamePrefix : _ifNamePrefixes) {
+ commonPattern.append("|(").append(ifNamePrefix).append(".*)");
+ }
+ if(fname.matches(commonPattern.toString())) {
+ return true;
+ }
+ return false;
+ }
+
public boolean checkNetwork(final String networkName) {
if (networkName == null) {
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5a134a6f/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 920c86a..98a074a 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -4999,4 +4999,17 @@ public class LibvirtComputingResourceTest {
assertFalse(answer.getResult());
}
+
+ @Test
+ public void testIsInterface () {
+ LibvirtComputingResource lvcr = new LibvirtComputingResource();
+ assertFalse(lvcr.isInterface("bla"));
+ assertTrue(lvcr.isInterface("p99p00"));
+ for (String ifNamePrefix : lvcr._ifNamePrefixes) {
+ // excluding regexps as "\\\\d+" won't replace with String.replaceAll(String,String);
+ if (!ifNamePrefix.contains("\\")) {
+ assertTrue(lvcr.isInterface(ifNamePrefix + "0"));
+ }
+ }
+ }
}
\ No newline at end of file