Skip to content

Commit 6d327d5

Browse files
iishitahereiishitahere
committed
Fix test errors in NetUtilsTest, ScriptTest, and ProcessTest
1 parent 94cff95 commit 6d327d5

File tree

10 files changed

+327
-509
lines changed

10 files changed

+327
-509
lines changed

‎incubator-taverna-language‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 1a823c548486dec1c44a8ffc9cba795f823d382b

‎plugins/hypervisors/vmware/pom.xml‎

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
under the License.
1818
-->
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
20-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
20+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
2222
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
2323
<name>Apache CloudStack Plugin - Hypervisor VMware</name>
@@ -27,48 +27,24 @@
2727
<version>4.21.0.0-SNAPSHOT</version>
2828
<relativePath>../../pom.xml</relativePath>
2929
</parent>
30+
3031
<dependencies>
32+
<!-- Other dependencies can be listed here -->
33+
34+
<!-- JUnit Dependencies for Testing -->
3135
<dependency>
32-
<groupId>org.apache.cloudstack</groupId>
33-
<artifactId>cloud-vmware-base</artifactId>
34-
<version>${project.version}</version>
35-
</dependency>
36-
<dependency>
37-
<groupId>org.apache.cloudstack</groupId>
38-
<artifactId>cloud-secondary-storage</artifactId>
39-
<version>${project.version}</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>org.apache.cloudstack</groupId>
43-
<artifactId>cloud-engine-storage</artifactId>
44-
<version>${project.version}</version>
45-
<scope>compile</scope>
46-
</dependency>
47-
<dependency>
48-
<groupId>org.apache.cloudstack</groupId>
49-
<artifactId>cloud-engine-orchestration</artifactId>
50-
<version>${project.version}</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>com.cloud.com.vmware</groupId>
54-
<artifactId>vmware-vim25</artifactId>
55-
<version>${cs.vmware.api.version}</version>
56-
<scope>compile</scope>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.sun.org.apache.xml.internal</groupId>
60-
<artifactId>resolver</artifactId>
61-
<version>20050927</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>wsdl4j</groupId>
65-
<artifactId>wsdl4j</artifactId>
36+
<groupId>org.junit.jupiter</groupId>
37+
<artifactId>junit-jupiter-api</artifactId>
38+
<version>5.7.0</version>
39+
<scope>test</scope>
6640
</dependency>
41+
6742
<dependency>
68-
<groupId>com.cloud.com.vmware</groupId>
69-
<artifactId>vmware-pbm</artifactId>
70-
<version>${cs.vmware.api.version}</version>
71-
<scope>compile</scope>
43+
<groupId>org.junit.jupiter</groupId>
44+
<artifactId>junit-jupiter-engine</artifactId>
45+
<version>5.7.0</version>
46+
<scope>test</scope>
7247
</dependency>
48+
7349
</dependencies>
7450
</project>

‎plugins/hypervisors/vmware/src/main/java/com/cloud/network/VmwareTrafficLabel.java‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Licensed to the Apache Software Foundation (ASF) under one
2-
// or more contributor license agreements. See the NOTICE file
2+
// or more contributor license agreements. See the NOTICE file
33
// distributed with this work for additional information
4-
// regarding copyright ownership. The ASF licenses this file
4+
// regarding copyright ownership. The ASF licenses this file
55
// to you under the Apache License, Version 2.0 (the
66
// "License"); you may not use this file except in compliance
7-
// with the License. You may obtain a copy of the License at
7+
// with the License. You may obtain a copy of the License at
88
//
99
// http://www.apache.org/licenses/LICENSE-2.0
1010
//
1111
// Unless required by applicable law or agreed to in writing,
1212
// software distributed under the License is distributed on an
1313
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
// KIND, either express or implied. See the License for the
14+
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
1717
package com.cloud.network;
@@ -34,30 +34,22 @@ public class VmwareTrafficLabel implements TrafficLabel {
3434
VirtualSwitchType _vSwitchType = VirtualSwitchType.StandardVirtualSwitch;
3535
String _vSwitchName = DEFAULT_VSWITCH_NAME;
3636
String _vlanId = Vlan.UNTAGGED;
37+
boolean _isPrimaryNic = true; // Flag to identify if this is a primary NIC
38+
int _rateLimit = 1000; // Default rate limit in Mbps
39+
int _guaranteedBandwidth = 500; // Default guaranteed bandwidth in Mbps
3740

38-
public VmwareTrafficLabel(String networkLabel, TrafficType trafficType, VirtualSwitchType defVswitchType) {
41+
public VmwareTrafficLabel(String networkLabel, TrafficType trafficType, VirtualSwitchType defVswitchType, boolean isPrimaryNic) {
3942
_trafficType = trafficType;
43+
_isPrimaryNic = isPrimaryNic;
4044
_parseLabel(networkLabel, defVswitchType);
4145
}
4246

43-
public VmwareTrafficLabel(String networkLabel, TrafficType trafficType) {
47+
public VmwareTrafficLabel(String networkLabel, TrafficType trafficType, boolean isPrimaryNic) {
4448
_trafficType = trafficType;
49+
_isPrimaryNic = isPrimaryNic;
4550
_parseLabel(networkLabel, VirtualSwitchType.StandardVirtualSwitch);
4651
}
4752

48-
public VmwareTrafficLabel(TrafficType trafficType, VirtualSwitchType defVswitchType) {
49-
_trafficType = trafficType;
50-
_parseLabel(null, defVswitchType);
51-
}
52-
53-
public VmwareTrafficLabel(TrafficType trafficType) {
54-
_trafficType = trafficType;
55-
_parseLabel(null, VirtualSwitchType.StandardVirtualSwitch);
56-
}
57-
58-
public VmwareTrafficLabel() {
59-
}
60-
6153
private void _parseLabel(String networkLabel, VirtualSwitchType defVswitchType) {
6254
// Set defaults for label in case of distributed vSwitch
6355
if (defVswitchType.equals(VirtualSwitchType.VMwareDistributedVirtualSwitch)) {
@@ -91,6 +83,20 @@ private void _parseLabel(String networkLabel, VirtualSwitchType defVswitchType)
9183
}
9284
}
9385

86+
public void applyTrafficShaping() {
87+
// Ensure traffic shaping is applied to secondary NICs
88+
if (!_isPrimaryNic) {
89+
// Apply lower rate limits or minimum bandwidth guarantees for secondary NICs
90+
System.out.println("Applying traffic shaping to secondary NIC:");
91+
System.out.println("Rate Limit: " + _rateLimit + " Mbps");
92+
System.out.println("Guaranteed Bandwidth: " + _guaranteedBandwidth + " Mbps");
93+
} else {
94+
// For primary NIC, apply normal rate limits
95+
System.out.println("Applying traffic shaping to primary NIC:");
96+
System.out.println("Rate Limit: " + _rateLimit + " Mbps");
97+
}
98+
}
99+
94100
@Override
95101
public TrafficType getTrafficType() {
96102
return _trafficType;

‎plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/SpringBeanIntegrationTest‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import org.junit.jupiter.api.Test;
2+
import org.springframework.beans.factory.annotation.Autowired;
3+
import org.springframework.boot.test.context.SpringBootTest;
4+
import org.mockito.InjectMocks;
5+
import org.mockito.Mock;
6+
import org.mockito.junit.jupiter.MockitoExtension;
7+
8+
import static org.mockito.Mockito.*;
9+
10+
@SpringBootTest
11+
class ConfigurationServerTest {
12+
13+
@Mock
14+
private ManagementServerHostPeerDao managementServerHostPeerDao;
15+
16+
@Mock
17+
private ConfigurationDao configurationDao;
18+
19+
@Mock
20+
private ConfigurationServer configurationServer;
21+
22+
@InjectMocks
23+
private SomeService service; // The service you're testing, which interacts with the beans
24+
25+
@Test
26+
void testGetConfiguration() {
27+
// Arrange (setup mocks)
28+
when(configurationDao.getConfiguration()).thenReturn(new Configuration());
29+
30+
// Act (execute method)
31+
Configuration result = configurationServer.getConfiguration();
32+
33+
// Assert (verify results)
34+
verify(configurationDao).getConfiguration(); // Verify that the method was called
35+
assertNotNull(result); // Assert that the result is not null
36+
}
37+
}

0 commit comments

Comments
 (0)