mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge remote-tracking branch 'apache/4.17' into main
This commit is contained in:
Abhishek Kumar
commit
687a21c116
@ -16,21 +16,33 @@
|
||||
// under the License.
|
||||
package org.apache.cloudstack.utils.linux;
|
||||
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtCapXMLParser;
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
|
||||
import com.cloud.utils.script.Script;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
|
||||
import org.apache.cloudstack.utils.security.ParserUtils;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.libvirt.Connect;
|
||||
import org.libvirt.LibvirtException;
|
||||
import org.libvirt.NodeInfo;
|
||||
import org.w3c.dom.Document;
|
||||
import org.w3c.dom.Element;
|
||||
import org.w3c.dom.NamedNodeMap;
|
||||
import org.w3c.dom.Node;
|
||||
import org.w3c.dom.NodeList;
|
||||
import org.xml.sax.InputSource;
|
||||
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.io.Reader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtCapXMLParser;
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
|
||||
import com.cloud.utils.script.Script;
|
||||
|
||||
public class KVMHostInfo {
|
||||
|
||||
@ -82,7 +94,7 @@ public class KVMHostInfo {
|
||||
return this.capabilities;
|
||||
}
|
||||
|
||||
protected static long getCpuSpeed(final NodeInfo nodeInfo) {
|
||||
protected static long getCpuSpeed(final String cpabilities, final NodeInfo nodeInfo) {
|
||||
long speed = 0L;
|
||||
speed = getCpuSpeedFromCommandLscpu();
|
||||
if(speed > 0L) {
|
||||
@ -94,6 +106,11 @@ public class KVMHostInfo {
|
||||
return speed;
|
||||
}
|
||||
|
||||
speed = getCpuSpeedFromHostCapabilities(cpabilities);
|
||||
if(speed > 0L) {
|
||||
return speed;
|
||||
}
|
||||
|
||||
LOGGER.info(String.format("Using the value [%s] provided by Libvirt.", nodeInfo.mhz));
|
||||
speed = nodeInfo.mhz;
|
||||
return speed;
|
||||
@ -125,12 +142,41 @@ public class KVMHostInfo {
|
||||
}
|
||||
}
|
||||
|
||||
protected static long getCpuSpeedFromHostCapabilities(final String capabilities) {
|
||||
LOGGER.info("Fetching CPU speed from \"host capabilities\"");
|
||||
long speed = 0L;
|
||||
try {
|
||||
DocumentBuilderFactory docFactory = ParserUtils.getSaferDocumentBuilderFactory();
|
||||
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
|
||||
Document doc = docBuilder.parse(new InputSource(new StringReader(capabilities)));
|
||||
Element rootElement = doc.getDocumentElement();
|
||||
NodeList nodes = rootElement.getElementsByTagName("cpu");
|
||||
Node node = nodes.item(0);
|
||||
nodes = ((Element)node).getElementsByTagName("counter");
|
||||
for (int i = 0; i < nodes.getLength(); i++) {
|
||||
node = nodes.item(i);
|
||||
NamedNodeMap attributes = node.getAttributes();
|
||||
Node nameNode = attributes.getNamedItem("name");
|
||||
Node freqNode = attributes.getNamedItem("frequency");
|
||||
if (nameNode != null && "tsc".equals(nameNode.getNodeValue()) && freqNode != null && StringUtils.isNotEmpty(freqNode.getNodeValue())) {
|
||||
speed = Long.parseLong(freqNode.getNodeValue()) / 1000000;
|
||||
LOGGER.info(String.format("Retrieved value [%s] from \"host capabilities\". This corresponds to a CPU speed of [%s] MHz.", freqNode.getNodeValue(), speed));
|
||||
}
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOGGER.error("Unable to fetch CPU speed from \"host capabilities\"", ex);
|
||||
speed = 0L;
|
||||
}
|
||||
return speed;
|
||||
}
|
||||
|
||||
private void getHostInfoFromLibvirt() {
|
||||
try {
|
||||
final Connect conn = LibvirtConnection.getConnection();
|
||||
final NodeInfo hosts = conn.nodeInfo();
|
||||
final String capabilities = conn.getCapabilities();
|
||||
if (this.cpuSpeed == 0) {
|
||||
this.cpuSpeed = getCpuSpeed(hosts);
|
||||
this.cpuSpeed = getCpuSpeed(capabilities, hosts);
|
||||
} else {
|
||||
LOGGER.debug(String.format("Using existing configured CPU frequency %s", this.cpuSpeed));
|
||||
}
|
||||
@ -146,7 +192,7 @@ public class KVMHostInfo {
|
||||
this.cpus = hosts.cpus;
|
||||
|
||||
final LibvirtCapXMLParser parser = new LibvirtCapXMLParser();
|
||||
parser.parseCapabilitiesXML(conn.getCapabilities());
|
||||
parser.parseCapabilitiesXML(capabilities);
|
||||
final ArrayList<String> oss = parser.getGuestOsType();
|
||||
for (final String s : oss) {
|
||||
/*
|
||||
|
||||
@ -16,23 +16,22 @@
|
||||
// under the License.
|
||||
package org.apache.cloudstack.utils.linux;
|
||||
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
|
||||
import org.apache.commons.lang.SystemUtils;
|
||||
|
||||
import org.hamcrest.Matchers;
|
||||
import org.junit.Test;
|
||||
import org.junit.Assume;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Assume;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.libvirt.Connect;
|
||||
import org.mockito.Mockito;
|
||||
|
||||
import org.libvirt.NodeInfo;
|
||||
import org.mockito.Mockito;
|
||||
import org.powermock.api.mockito.PowerMockito;
|
||||
import org.powermock.core.classloader.annotations.PowerMockIgnore;
|
||||
import org.powermock.core.classloader.annotations.PrepareForTest;
|
||||
import org.powermock.modules.junit4.PowerMockRunner;
|
||||
|
||||
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
|
||||
|
||||
@RunWith(PowerMockRunner.class)
|
||||
@PrepareForTest(value = {LibvirtConnection.class})
|
||||
@PowerMockIgnore({"javax.xml.*", "org.w3c.dom.*", "org.apache.xerces.*", "org.xml.*"})
|
||||
@ -45,7 +44,21 @@ public class KVMHostInfoTest {
|
||||
Assume.assumeTrue(SystemUtils.IS_OS_LINUX);
|
||||
NodeInfo nodeInfo = Mockito.mock(NodeInfo.class);
|
||||
nodeInfo.mhz = 1000;
|
||||
Assert.assertThat(KVMHostInfo.getCpuSpeed(nodeInfo), Matchers.greaterThan(0l));
|
||||
Assert.assertThat(KVMHostInfo.getCpuSpeed(null, nodeInfo), Matchers.greaterThan(0l));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getCpuSpeedFromHostCapabilities() {
|
||||
String capabilities = "<host>\n" +
|
||||
"<uuid>8a330742-345f-b0df-7954-c9960b88116c</uuid>\n" +
|
||||
" <cpu>\n" +
|
||||
" <arch>x86_64</arch>\n" +
|
||||
" <model>Opteron_G2</model>\n" +
|
||||
" <vendor>AMD</vendor>\n" +
|
||||
" <counter name='tsc' frequency='2350000000' scaling='no'/>\n" +
|
||||
" </cpu>\n" +
|
||||
"</host>\n";;
|
||||
Assert.assertEquals(2350L, KVMHostInfo.getCpuSpeedFromHostCapabilities(capabilities));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
14
pom.xml
14
pom.xml
@ -623,6 +623,20 @@
|
||||
<groupId>org.opensaml</groupId>
|
||||
<artifactId>opensaml</artifactId>
|
||||
<version>${cs.opensaml.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jcl-over-slf4j</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jul-to-slf4j</artifactId>
|
||||
</exclusion>
|
||||
<exclusion>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>log4j-over-slf4j</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.owasp.esapi</groupId>
|
||||
|
||||
@ -4640,7 +4640,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
|
||||
}
|
||||
if (!StringUtils.isAllEmpty(ipv6Range, vlan.getIp6Range())) {
|
||||
String r1 = StringUtils.isEmpty(ipv6Range) ? NetUtils.getIpv6RangeFromCidr(vlanIp6Cidr) : ipv6Range;
|
||||
String r2 = StringUtils.isEmpty(vlan.getIp6Range()) ? NetUtils.getIpv6RangeFromCidr(vlanIp6Cidr) : vlan.getIp6Range();
|
||||
String r2 = StringUtils.isEmpty(vlan.getIp6Range()) ? NetUtils.getIpv6RangeFromCidr(vlan.getIp6Cidr()) : vlan.getIp6Range();
|
||||
if(NetUtils.isIp6RangeOverlap(r1, r2)) {
|
||||
throw new InvalidParameterValueException(String.format("The IPv6 range with tag: %s already has IPs that overlap with the new range.",
|
||||
vlan.getVlanTag()));
|
||||
|
||||
@ -239,7 +239,7 @@
|
||||
</div>
|
||||
<div class="form__item" v-if="!basicGuestNetwork && form.iptype != 'ip6'">
|
||||
<div style="color: black;">{{ $t('label.set.reservation') }}</div>
|
||||
<a-switch @change="handleShowAccountFields" />
|
||||
<a-switch v-model:checked="showAccountFields" @change="handleShowAccountFields" />
|
||||
</div>
|
||||
<div v-if="showAccountFields && !basicGuestNetwork" style="margin-top: 20px;">
|
||||
<div v-html="$t('label.set.reservation.desc')"></div>
|
||||
@ -555,12 +555,9 @@ export default {
|
||||
this.fetchDomains()
|
||||
},
|
||||
handleShowAccountFields () {
|
||||
if (this.showAccountFields === false) {
|
||||
this.showAccountFields = true
|
||||
if (this.showAccountFields) {
|
||||
this.fetchDomains()
|
||||
return
|
||||
}
|
||||
this.showAccountFields = false
|
||||
},
|
||||
handleOpenAddIpRangeModal () {
|
||||
this.initAddIpRangeForm()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user