cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [4/6] git commit: updated refs/heads/master to b69dff7
Date Sun, 25 Oct 2015 20:03:44 GMT
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 <daan@onecht.net>
Authored: Fri Oct 23 17:10:03 2015 +0200
Committer: Daan Hoogland <daan@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 "";
      }
  


Mime
View raw message