git commit: updated refs/heads/master to 40d133d
Repository: cloudstack
Updated Branches:
refs/heads/master 03de9cc33 -> 40d133dd7
NuageVSP is a noredist component
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40d133dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40d133dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40d133dd
Branch: refs/heads/master
Commit: 40d133dd7358be1940edd8e2a776e035c230c226
Parents: 03de9cc
Author: Hugo Trippaers
Authored: Mon Jul 21 11:05:29 2014 +0200
Committer: Hugo Trippaers
Committed: Mon Jul 21 11:05:29 2014 +0200
--
client/pom.xml | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40d133dd/client/pom.xml
--
diff --git a/client/pom.xml b/client/pom.xml
index 1621a05..d4ead21 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -106,11 +106,6 @@
${project.version}
- org.apache.cloudstack
- cloud-plugin-network-vsp
- ${project.version}
-
-
org.apache.cloudstack
cloud-plugin-network-ovs
${project.version}
@@ -1033,5 +1028,16 @@
+
+ nuagevsp
+
+
+ noredist
+
+
+
+network-elements/nuage-vsp
+
+
git commit: updated refs/heads/master to fe4e485
Repository: cloudstack Updated Branches: refs/heads/master 40d133dd7 -> fe4e4858c Let's blame it on the fact that its monday Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe4e4858 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe4e4858 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe4e4858 Branch: refs/heads/master Commit: fe4e4858ce24de153b06b87a9bbcb40850f34301 Parents: 40d133d Author: Hugo Trippaers Authored: Mon Jul 21 11:14:29 2014 +0200 Committer: Hugo Trippaers Committed: Mon Jul 21 11:14:29 2014 +0200 -- client/pom.xml | 11 --- 1 file changed, 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe4e4858/client/pom.xml -- diff --git a/client/pom.xml b/client/pom.xml index d4ead21..410cb19 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -1028,16 +1028,5 @@ - - nuagevsp - - - noredist - - - -network-elements/nuage-vsp - -
git commit: updated refs/heads/master to b8ddbe8
Repository: cloudstack
Updated Branches:
refs/heads/master fe4e4858c -> b8ddbe8ff
CLOUDSTACK-6239: Encrypt security related config values before inserting into DB
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8ddbe8f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8ddbe8f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8ddbe8f
Branch: refs/heads/master
Commit: b8ddbe8ffa5718c5ab5c9b3438467c284af0de50
Parents: fe4e485
Author: Kishan Kavala
Authored: Fri Mar 28 18:47:05 2014 +0530
Committer: Kishan Kavala
Committed: Mon Jul 21 14:49:07 2014 +0530
--
.../cloudstack/framework/security/keys/KeysManagerImpl.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8ddbe8f/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java
--
diff --git
a/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java
b/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java
index 550bd15..15bb49c 100644
---
a/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java
+++
b/framework/security/src/org/apache/cloudstack/framework/security/keys/KeysManagerImpl.java
@@ -61,7 +61,7 @@ public class KeysManagerImpl implements KeysManager,
Configurable {
public String getHashKey() {
String value = HashKey.value();
if (value == null) {
-_configDepot.set(HashKey, getBase64EncodedRandomKey(128));
+_configDao.getValueAndInitIfNotExist(HashKey.key(),
HashKey.category(), getBase64EncodedRandomKey(128), HashKey.description());
}
return HashKey.value();
@@ -71,7 +71,8 @@ public class KeysManagerImpl implements KeysManager,
Configurable {
public String getEncryptionKey() {
String value = EncryptionKey.value();
if (value == null) {
-_configDepot.set(EncryptionKey, getBase64EncodedRandomKey(128));
+_configDao.getValueAndInitIfNotExist(EncryptionKey.key(),
EncryptionKey.category(), getBase64EncodedRandomKey(128),
+EncryptionKey.description());
}
return EncryptionKey.value();
}
@@ -80,7 +81,8 @@ public class KeysManagerImpl implements KeysManager,
Configurable {
public String getEncryptionIV() {
String value = EncryptionIV.value();
if (value == null) {
-_configDepot.set(EncryptionIV, getBase64EncodedRandomKey(128));
+_configDao.getValueAndInitIfNotExist(EncryptionIV.key(),
EncryptionIV.category(), getBase64EncodedRandomKey(128),
+EncryptionIV.description());
}
return EncryptionIV.value();
}
git commit: updated refs/heads/master to 9dc322d
Repository: cloudstack
Updated Branches:
refs/heads/master b8ddbe8ff -> 9dc322d46
CLOUDSTACK-7144: No GSLB provider is available during assigning load
balancing rule
this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9dc322d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9dc322d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9dc322d4
Branch: refs/heads/master
Commit: 9dc322d46fa5cfb9abd87c408988abad1219d607
Parents: b8ddbe8
Author: Murali Reddy
Authored: Mon Jul 21 16:48:28 2014 +0530
Committer: Murali Reddy
Committed: Mon Jul 21 16:50:21 2014 +0530
--
.../core/spring-core-registry-core-context.xml | 5 +
...re-lifecycle-network-context-inheritable.xml | 8 ++--
.../spring-server-core-managers-context.xml | 5 +++--
.../GlobalLoadBalancingRulesServiceImpl.java| 21
...GlobalLoadBalancingRulesServiceImplTest.java | 4 +++-
5 files changed, 30 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dc322d4/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
--
diff --git
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
index 908d8f0..02034d6 100644
---
a/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
+++
b/core/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml
@@ -234,6 +234,11 @@
+
+
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dc322d4/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
--
diff --git
a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
index e5086d2..1986777 100644
---
a/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
+++
b/core/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml
@@ -98,5 +98,9 @@
-
-
\ No newline at end of file
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dc322d4/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
--
diff --git
a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
index fc1c7e2..1eba0b2 100644
---
a/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
+++
b/server/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml
@@ -224,7 +224,8 @@
-
+
class="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" >
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9dc322d4/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
--
diff --git
a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
index c84fea2..1d2c62b 100644
---
a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
+++
b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java
@@ -95,10 +95,10 @@ public class GlobalLoadBalancingRulesServiceImpl implements
GlobalLoadBalancingR
@Inject
AgentManager _agentMgr;
-protected GslbServiceProvider _gslbProvider = null;
+protected List _gslbProviders;
-public void setGslbServiceProvider(GslbServiceProvider provider) {
-_gslbProvider = provider;
+public void setGslbServiceProviders(List providers) {
+_gslbProviders = providers;
}
@Override
@@ -656,8 +656,8 @@ public class GlobalLoadBalancingRulesServiceImpl implements
GlobalLoadBalancingR
new SiteLoadBalancerConfig(gslbLbMapVo.isRevoke(),
serviceType, ip.getAddress().addr(),
Integer.toString(loadBalancer.getDefaultPortStart()),
dataCenterId);
-
siteLb.setGslbProviderPublicIp(_gslbProvider.getZoneGslbProviderPubli
git commit: updated refs/heads/master to 58bad41
Repository: cloudstack
Updated Branches:
refs/heads/master 9dc322d46 -> 58bad4191
Fixed CLOUDSTACK-6983: unable to register lxc template
added a check for tar.gz format in checktemplate
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/58bad419
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/58bad419
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/58bad419
Branch: refs/heads/master
Commit: 58bad41910970fb3b08aa4d21875af6d04c8bf2e
Parents: 9dc322d
Author: Rajani Karuturi
Authored: Thu Jul 17 11:44:26 2014 +0530
Committer: Kishan Kavala
Committed: Mon Jul 21 16:57:53 2014 +0530
--
.../org/apache/cloudstack/utils/template/TemplateUtils.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58bad419/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
--
diff --git a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
index a3f3a68..cf1e177 100644
--- a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
@@ -61,6 +61,13 @@ public class TemplateUtils {
s_logger.debug("File at path " + path + " looks like ova : " +
output);
return "";
}
+
+//lxc
+if (output.contains("POSIX tar") && isCorrectExtension(url, "tar")) {
+s_logger.debug("File at path " + path + " looks like just tar : "
+ output);
+return "";
+}
+
if (output.contains("ISO 9660") && isCorrectExtension(url, "iso")) {
s_logger.debug("File at path " + path + " looks like an iso : " +
output);
return "";
git commit: updated refs/heads/master to 77dadd7
Repository: cloudstack
Updated Branches:
refs/heads/master 58bad4191 -> 77dadd75c
CLOUDSTACK-6787: Publishing uuids missing in some cases, adding/correcting
events in some cases.
Also fixed a bug in the global config framework.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77dadd75
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77dadd75
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77dadd75
Branch: refs/heads/master
Commit: 77dadd75c49142b0cf3a4af29377d0fc54892b6a
Parents: 58bad41
Author: Nitin Mehta
Authored: Mon Jul 21 14:07:41 2014 -0700
Committer: Nitin Mehta
Committed: Mon Jul 21 14:08:18 2014 -0700
--
.../command/user/firewall/CreateEgressFirewallRuleCmd.java | 1 +
.../org/apache/cloudstack/framework/config/ConfigKey.java | 2 +-
server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 9 +
.../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 3 +++
4 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77dadd75/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
index 1a0cfae..48ee0df 100644
---
a/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -261,6 +261,7 @@ public class CreateEgressFirewallRuleCmd extends
BaseAsyncCreateCmd implements F
try {
FirewallRule result =
_firewallService.createEgressFirewallRule(this);
setEntityId(result.getId());
+setEntityUuid(result.getUuid());
} catch (NetworkRuleConflictException ex) {
s_logger.info("Network rule conflict: " + ex.getMessage());
s_logger.trace("Network Rule Conflict: ", ex);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77dadd75/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
--
diff --git
a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
index b400e6f..d39bb5d 100644
--- a/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
+++ b/framework/config/src/org/apache/cloudstack/framework/config/ConfigKey.java
@@ -133,7 +133,7 @@ public class ConfigKey {
public T value() {
if (_value == null || isDynamic()) {
ConfigurationVO vo = s_depot != null ?
s_depot.global().findById(key()) : null;
-_value = valueOf(vo != null ? vo.getValue() : defaultValue());
+_value = valueOf((vo != null && vo.getValue() != null) ?
vo.getValue() : defaultValue());
}
return _value;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77dadd75/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
--
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index 96d82ad..01c1486 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -795,6 +795,7 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScale
}
@Override
+@ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_CREATE,
eventDescription = "creating autoscale vm group", async = true)
public boolean configureAutoScaleVmGroup(CreateAutoScaleVmGroupCmd cmd)
throws ResourceUnavailableException {
return configureAutoScaleVmGroup(cmd.getEntityId(),
AutoScaleVmGroup.State_New);
}
@@ -823,7 +824,7 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScale
@Override
@DB
-@ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DELETE,
eventDescription = "deleting autoscale vm group")
+@ActionEvent(eventType = EventTypes.EVENT_AUTOSCALEVMGROUP_DELETE,
eventDescription = "deleting autoscale vm group", async = true)
public boolean deleteAutoScaleVmGroup(final long id) {
AutoScaleVmGroupVO autoScaleVmGroupVO =
getEntityInDatabase(CallContext.current().getCallingAccount(), "AutoScale Vm
Group", id, _autoScaleVmGroupDao);
@@ -997,7 +998,7 @@ public class AutoScaleManagerImpl extends ManagerBase
implements AutoScale
}
@Ove
git commit: updated refs/heads/4.4 to 5ee7bf1
Repository: cloudstack
Updated Branches:
refs/heads/4.4 5ad2b4fed -> 5ee7bf1be
Revert "fix iptables chain name too long (must be under 30 chars)"
This reverts commit 88f866645b1aa3f373691a43586f2aa56150b0c3.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ee7bf1b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ee7bf1b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ee7bf1b
Branch: refs/heads/4.4
Commit: 5ee7bf1be0fbbdf13067d82e556d25da575955b1
Parents: 5ad2b4f
Author: Frank.Zhang
Authored: Mon Jul 21 17:27:45 2014 -0700
Committer: Frank.Zhang
Committed: Mon Jul 21 17:27:45 2014 -0700
--
scripts/vm/hypervisor/xenserver/vmops | 12 +-
scripts/vm/hypervisor/xenserver/vmops.orig | 1495 ---
2 files changed, 2 insertions(+), 1505 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee7bf1b/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops
b/scripts/vm/hypervisor/xenserver/vmops
index 04dfb5d..3f25a2e 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -250,8 +250,6 @@ def chain_name(vm_name):
if vm_name.startswith('i-') or vm_name.startswith('r-'):
if vm_name.endswith('untagged'):
return '-'.join(vm_name.split('-')[:-1])
-if len(vm_name) > 28:
-vm_name = vm_name[0:27]
return vm_name
def chain_name_def(vm_name):
@@ -259,17 +257,11 @@ def chain_name_def(vm_name):
if vm_name.endswith('untagged'):
return '-'.join(vm_name.split('-')[:-2]) + "-def"
return '-'.join(vm_name.split('-')[:-1]) + "-def"
-
-if len(vm_name) > 28:
-vm_name = vm_name[0:27]
return vm_name
def egress_chain_name(vm_name):
-name = chain_name(vm_name) + "-eg"
-if len(name) > 28:
-name = name[0:27]
-return name
-
+return chain_name(vm_name) + "-eg"
+
@echo
def can_bridge_firewall(session, args):
try:
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ee7bf1b/scripts/vm/hypervisor/xenserver/vmops.orig
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops.orig
b/scripts/vm/hypervisor/xenserver/vmops.orig
deleted file mode 100755
index 3f25a2e..000
--- a/scripts/vm/hypervisor/xenserver/vmops.orig
+++ /dev/null
@@ -1,1495 +0,0 @@
-#!/usr/bin/python
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# Version @VERSION@
-#
-# A plugin for executing script needed by vmops cloud
-
-import os, sys, time
-import XenAPIPlugin
-if os.path.exists("/opt/xensource/sm"):
-sys.path.extend(["/opt/xensource/sm/", "/usr/local/sbin/", "/sbin/"])
-if os.path.exists("/usr/lib/xcp/sm"):
-sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
-import base64
-import socket
-import stat
-import tempfile
-import util
-import subprocess
-import zlib
-import cloudstack_pluginlib as lib
-import logging
-from util import CommandException
-
-lib.setup_logging("/var/log/cloud/vmops.log")
-
-def echo(fn):
-def wrapped(*v, **k):
-name = fn.__name__
-logging.debug(" VMOPS enter %s " % name )
-res = fn(*v, **k)
-logging.debug(" VMOPS exit %s " % name )
-return res
-return wrapped
-
-@echo
-def add_to_VCPUs_params_live(session, args):
-key = args['key']
-value = args['value']
-vmname = args['vmname']
-try:
-cmd = ["bash", "/opt/cloud/bin/add_to_vcpus_params_live.sh", vmname,
key, value]
-txt = util.pread2(cmd)
-except:
-return 'false'
-return 'true'
-
-@echo
-def setup_iscsi(session, args):
- uuid=args['uuid']
- try:
- cmd = ["bash", "/opt/cloud/bin/setup_iscsi.sh", uuid]
- txt = util.pread2(cmd)
- except:
- txt = ''
- return txt
-
-
-@echo
-def getgateway(session, args):
-mgmt_ip = args['mgmtIP']
-try:
-
git commit: updated refs/heads/master to 88f3517
Repository: cloudstack Updated Branches: refs/heads/master 77dadd75c -> 88f35179e Revert "CLOUDSTACK-7130: Adding BugId to failed test cases" This reverts commit 24da72f37395a6bb612ea1d073db0155289cf000. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/88f35179 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/88f35179 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/88f35179 Branch: refs/heads/master Commit: 88f35179ef90dc4f7696b6fe2e8ee7ca4d00586c Parents: 77dadd7 Author: Girish Shilamkar Authored: Mon Jul 21 19:10:34 2014 -0400 Committer: Girish Shilamkar Committed: Mon Jul 21 19:10:34 2014 -0400 -- test/integration/smoke/test_volumes.py | 16 1 file changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88f35179/test/integration/smoke/test_volumes.py -- diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index c6c0acc..7fbcc21 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -113,7 +113,7 @@ class TestCreateVolume(cloudstackTestCase): self.dbclient = self.testClient.getDbConnection() self.cleanup = [] -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true") def test_01_create_volume(self): """Test Volume creation for all Disk Offerings (incl. custom) """ @@ -343,7 +343,7 @@ class TestVolumes(cloudstackTestCase): cleanup_resources(self.apiClient, self.cleanup) return -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true") def test_02_attach_volume(self): """Attach a created Volume to a Running VM """ @@ -389,7 +389,7 @@ class TestVolumes(cloudstackTestCase): (self.virtual_machine.ipaddress, e)) return -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") def test_03_download_attached_volume(self): """Download a Volume attached to a VM """ @@ -411,7 +411,7 @@ class TestVolumes(cloudstackTestCase): with self.assertRaises(Exception): self.apiClient.extractVolume(cmd) -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") def test_04_delete_attached_volume(self): """Delete a Volume attached to a VM """ @@ -432,7 +432,7 @@ class TestVolumes(cloudstackTestCase): with self.assertRaises(Exception): self.apiClient.deleteVolume(cmd) -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") def test_05_detach_volume(self): """Detach a Volume attached to a VM """ @@ -474,7 +474,7 @@ class TestVolumes(cloudstackTestCase): ) return -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true") def test_06_download_detached_volume(self): """Download a Volume unattached to an VM """ @@ -511,7 +511,7 @@ class TestVolumes(cloudstackTestCase): % (extract_vol.url, self.volume.id) ) -@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="true") def test_07_resize_fail(self): """Test resize (negative) non-existent volume""" # Verify the size is the new size is what we wanted it to be. @@ -729,7 +729,7 @@ class TestVolumes(cloudstackTestCase): time.sleep(30) return -@attr(tags = ["advanced", "advancedns", "smoke","basic"], required_hardware="false", BugId="CLOUDSTACK-7130") +@attr(tags = ["advanced", "advancedns", "smoke","basic"], required_hardware="false") def test_09_delete_detached_volume(self): """Delete a Volume
git commit: updated refs/heads/master to 4596ae9
Repository: cloudstack Updated Branches: refs/heads/master 88f35179e -> 4596ae9aa Changed delete method signature inside VirtualMachine class. From 4.3 onwards vm destroy has expunge parameter to expunge the vm immediately. Signed-off-by: sanjeev Signed-off-by: Santhosh Edukulla Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4596ae9a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4596ae9a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4596ae9a Branch: refs/heads/master Commit: 4596ae9aac81ecec2c1de95950da431e7490b95d Parents: 88f3517 Author: sanjeev Authored: Thu Jul 17 17:19:04 2014 +0530 Committer: Santhosh Edukulla Committed: Tue Jul 22 11:50:01 2014 +0530 -- tools/marvin/marvin/lib/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4596ae9a/tools/marvin/marvin/lib/base.py -- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index e9d5bb4..8d40591 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -612,10 +612,11 @@ class VirtualMachine: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.updateVirtualMachine(cmd)) -def delete(self, apiclient): +def delete(self, apiclient, **kwargs): """Destroy an Instance""" cmd = destroyVirtualMachine.destroyVirtualMachineCmd() cmd.id = self.id +[setattr(cmd, k, v) for k, v in kwargs.items()] apiclient.destroyVirtualMachine(cmd) def expunge(self, apiclient):
git commit: updated refs/heads/master to b3e4c6d
Repository: cloudstack
Updated Branches:
refs/heads/master 4596ae9aa -> b3e4c6d6d
CLOUDSTACK-7150. [VMware] Global config 'vm.instancename' is not honored.
If global config 'vm.instancename' is set to true, VM name in vCenter should be
'-'.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3e4c6d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3e4c6d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3e4c6d6
Branch: refs/heads/master
Commit: b3e4c6d6dc9bf57aa880ab100a76027b2a12053d
Parents: 4596ae9
Author: Likitha Shetty
Authored: Tue Jul 22 09:48:20 2014 +0530
Committer: Likitha Shetty
Committed: Tue Jul 22 11:59:53 2014 +0530
--
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3e4c6d6/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 7b73b19..0c4ab20 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1832,7 +1832,8 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
vmInternalCSName = vmSpec.getName();
if (_instanceNameFlag == true) {
String[] tokens = vmInternalCSName.split("-");
-vmNameOnVcenter = String.format("%s-%s-%s", tokens[0],
tokens[1], vmSpec.getHostName());
+assert (tokens.length >= 3); // vmInternalCSName has format
i-x-y-
+vmNameOnVcenter = String.format("%s-%s-%s-%s", tokens[0],
tokens[1], tokens[2], vmSpec.getHostName());
}
else
vmNameOnVcenter = vmSpec.getName();
