Skip to content

Commit 4be8278

Browse files
leomaatEricleomaatEric
committed
Revert "add global_config support and refactor model classes"
This reverts commit 97ac752.
1 parent 97ac752 commit 4be8278

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+82
-141
lines changed

‎src/e2e-test/java/com/cisco/trex/stateless/TRexClientBPFTest.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
import static java.lang.Thread.sleep;
44

5-
import com.cisco.trex.model.Port;
6-
import com.cisco.trex.model.TRexClientResult;
7-
import com.cisco.trex.model.capture.CaptureInfo;
8-
import com.cisco.trex.model.capture.CaptureMonitor;
9-
import com.cisco.trex.model.capture.CapturedPackets;
10-
import com.cisco.trex.model.capture.CapturedPkt;
115
import com.cisco.trex.stateless.exception.TRexConnectionException;
126
import com.cisco.trex.stateless.exception.TRexTimeoutException;
7+
import com.cisco.trex.stateless.model.*;
8+
import com.cisco.trex.stateless.model.capture.*;
139
import java.util.*;
1410
import java.util.stream.Collectors;
1511
import org.junit.*;

‎src/e2e-test/java/com/cisco/trex/stateless/TRexClientTest.java‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,17 @@
22

33
import static java.lang.Thread.sleep;
44

5-
import com.cisco.trex.model.Ipv6Node;
6-
import com.cisco.trex.model.PortStatus;
7-
import com.cisco.trex.model.RPCResponse;
8-
import com.cisco.trex.stateless.model.Stream;
9-
import com.cisco.trex.stateless.model.StreamMode;
10-
import com.cisco.trex.stateless.model.StreamModeRate;
11-
import com.cisco.trex.stateless.model.StreamVM;
12-
import com.cisco.trex.model.StubResult;
13-
import com.cisco.trex.model.TRexClientResult;
14-
import com.cisco.trex.stateless.model.stats.ActivePGIds;
15-
import com.cisco.trex.model.stats.ExtendedPortStatistics;
16-
import com.cisco.trex.stateless.model.stats.FlowStat;
17-
import com.cisco.trex.stateless.model.stats.PGIdStatsRPCResult;
18-
import com.cisco.trex.model.stats.PortStatistics;
195
import com.cisco.trex.stateless.exception.ServiceModeRequiredException;
206
import com.cisco.trex.stateless.exception.TRexConnectionException;
217
import com.cisco.trex.stateless.exception.TRexTimeoutException;
22-
import com.cisco.trex.model.Port;
23-
import com.cisco.trex.model.capture.CaptureInfo;
24-
import com.cisco.trex.model.capture.CaptureMonitor;
25-
import com.cisco.trex.model.capture.CaptureMonitorStop;
26-
import com.cisco.trex.model.capture.CapturedPackets;
27-
import com.cisco.trex.model.port.PortVlan;
8+
import com.cisco.trex.stateless.model.*;
9+
import com.cisco.trex.stateless.model.Port;
10+
import com.cisco.trex.stateless.model.capture.CaptureInfo;
11+
import com.cisco.trex.stateless.model.capture.CaptureMonitor;
12+
import com.cisco.trex.stateless.model.capture.CaptureMonitorStop;
13+
import com.cisco.trex.stateless.model.capture.CapturedPackets;
14+
import com.cisco.trex.stateless.model.port.PortVlan;
15+
import com.cisco.trex.stateless.model.stats.*;
2816
import com.cisco.trex.stateless.model.vm.VMInstruction;
2917
import java.net.Inet4Address;
3018
import java.net.InetAddress;

‎src/main/java/com/cisco/trex/ClientBase.java‎

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package com.cisco.trex;
22

3-
import com.cisco.trex.model.GlobalConfig;
43
import com.cisco.trex.stateless.TRexCommand;
54
import com.cisco.trex.stateless.TRexTransport;
65
import com.cisco.trex.stateless.exception.TRexConnectionException;
7-
import com.cisco.trex.model.L2Configuration;
8-
import com.cisco.trex.model.Port;
9-
import com.cisco.trex.model.PortStatus;
10-
import com.cisco.trex.model.RPCResponse;
11-
import com.cisco.trex.model.StubResult;
12-
import com.cisco.trex.model.SystemInfo;
13-
import com.cisco.trex.model.TRexClientResult;
14-
import com.cisco.trex.model.capture.CaptureInfo;
15-
import com.cisco.trex.model.capture.CaptureMonitor;
16-
import com.cisco.trex.model.capture.CaptureMonitorStop;
17-
import com.cisco.trex.model.capture.CapturedPackets;
18-
import com.cisco.trex.model.stats.ExtendedPortStatistics;
19-
import com.cisco.trex.model.stats.GlobalStatistics;
20-
import com.cisco.trex.model.stats.PortStatistics;
21-
import com.cisco.trex.model.stats.XstatsNames;
6+
import com.cisco.trex.stateless.model.L2Configuration;
7+
import com.cisco.trex.stateless.model.Port;
8+
import com.cisco.trex.stateless.model.PortStatus;
9+
import com.cisco.trex.stateless.model.RPCResponse;
10+
import com.cisco.trex.stateless.model.StubResult;
11+
import com.cisco.trex.stateless.model.SystemInfo;
12+
import com.cisco.trex.stateless.model.TRexClientResult;
13+
import com.cisco.trex.stateless.model.capture.CaptureInfo;
14+
import com.cisco.trex.stateless.model.capture.CaptureMonitor;
15+
import com.cisco.trex.stateless.model.capture.CaptureMonitorStop;
16+
import com.cisco.trex.stateless.model.capture.CapturedPackets;
17+
import com.cisco.trex.stateless.model.stats.ExtendedPortStatistics;
18+
import com.cisco.trex.stateless.model.stats.GlobalStatistics;
19+
import com.cisco.trex.stateless.model.stats.PortStatistics;
20+
import com.cisco.trex.stateless.model.stats.XstatsNames;
2221
import com.cisco.trex.stateless.util.DoubleAsIntDeserializer;
2322
import com.cisco.trex.util.Constants;
2423
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -549,29 +548,6 @@ public SystemInfo getSystemInfo() {
549548
return GSON.fromJson(getResultFromResponse(json), SystemInfo.class);
550549
}
551550

552-
/**
553-
* Get global configuration parameters
554-
*
555-
* @return GlobalConfig
556-
*/
557-
public TRexClientResult<GlobalConfig> getGlobalConfig(int portIdx) {
558-
Map<String, Object> payload = new HashMap<>();
559-
return callMethod("get_global_cfg", null, GlobalConfig.class);
560-
}
561-
562-
/**
563-
* Change global configuration parameter
564-
*
565-
* @param name parameter name
566-
* @param value parameter value in data types of dboule, boolean depending on the parameter type
567-
* @return StubResult
568-
*/
569-
public TRexClientResult<StubResult> setGlobalConfig(String name, Object value) {
570-
Map<String, Object> payload = new HashMap<>();
571-
payload.put(name, value);
572-
return callMethod("set_global_cfg", payload, StubResult.class);
573-
}
574-
575551
protected Map<String, Object> createPayload(int portIndex) {
576552
Map<String, Object> payload = new HashMap<>();
577553
payload.put(PORT_ID, portIndex);

‎src/main/java/com/cisco/trex/model/GlobalConfig.java‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎src/main/java/com/cisco/trex/model/StubResult.java‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎src/main/java/com/cisco/trex/stateful/TRexAstfClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.cisco.trex.stateful.model.stats.LatencyStats;
1010
import com.cisco.trex.stateful.model.stats.MetaData;
1111
import com.cisco.trex.stateless.exception.TRexConnectionException;
12-
import com.cisco.trex.model.ApiVersionHandler;
13-
import com.cisco.trex.model.TRexClientResult;
12+
import com.cisco.trex.stateless.model.ApiVersionHandler;
13+
import com.cisco.trex.stateless.model.TRexClientResult;
1414
import com.cisco.trex.util.Constants;
1515
import com.cisco.trex.util.TRexClientUtil;
1616
import com.cisco.trex.util.TRexServerMode;

‎src/main/java/com/cisco/trex/stateless/IPv6NeighborDiscoveryService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import static org.pcap4j.util.ByteArrays.BYTE_SIZE_IN_BYTES;
44

55
import com.cisco.trex.stateless.exception.ServiceModeRequiredException;
6-
import com.cisco.trex.model.Ipv6Node;
7-
import com.cisco.trex.model.PortStatus;
6+
import com.cisco.trex.stateless.model.Ipv6Node;
7+
import com.cisco.trex.stateless.model.PortStatus;
88
import com.cisco.trex.stateless.model.StreamMode;
99
import com.cisco.trex.stateless.model.StreamModeRate;
1010
import com.cisco.trex.stateless.model.StreamVM;
11-
import com.cisco.trex.model.TRexClientResult;
12-
import com.cisco.trex.model.port.PortVlan;
11+
import com.cisco.trex.stateless.model.TRexClientResult;
12+
import com.cisco.trex.stateless.model.port.PortVlan;
1313
import com.cisco.trex.stateless.model.vm.VMInstruction;
1414
import com.google.common.collect.Lists;
1515
import java.net.Inet6Address;

‎src/main/java/com/cisco/trex/stateless/TRexClient.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import com.cisco.trex.ClientBase;
44
import com.cisco.trex.stateless.exception.ServiceModeRequiredException;
55
import com.cisco.trex.stateless.exception.TRexConnectionException;
6-
import com.cisco.trex.model.ApiVersionHandler;
7-
import com.cisco.trex.model.Ipv6Node;
8-
import com.cisco.trex.model.Port;
9-
import com.cisco.trex.model.PortStatus;
6+
import com.cisco.trex.stateless.model.ApiVersionHandler;
7+
import com.cisco.trex.stateless.model.Ipv6Node;
8+
import com.cisco.trex.stateless.model.Port;
9+
import com.cisco.trex.stateless.model.PortStatus;
1010
import com.cisco.trex.stateless.model.Stream;
1111
import com.cisco.trex.stateless.model.StreamMode;
1212
import com.cisco.trex.stateless.model.StreamModeRate;
1313
import com.cisco.trex.stateless.model.StreamVM;
14-
import com.cisco.trex.model.TRexClientResult;
15-
import com.cisco.trex.model.port.PortVlan;
14+
import com.cisco.trex.stateless.model.TRexClientResult;
15+
import com.cisco.trex.stateless.model.port.PortVlan;
1616
import com.cisco.trex.stateless.model.stats.ActivePGIds;
1717
import com.cisco.trex.stateless.model.stats.ActivePGIdsRPCResult;
1818
import com.cisco.trex.stateless.model.stats.PGIdStatsRPCResult;

‎src/main/java/com/cisco/trex/stateless/TRexTransport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.cisco.trex.stateless;
22

3-
import com.cisco.trex.model.RPCResponse;
3+
import com.cisco.trex.stateless.model.RPCResponse;
44
import com.cisco.trex.stateless.util.IDataCompressor;
55
import com.cisco.trex.stateless.util.TRexDataCompressor;
66
import com.fasterxml.jackson.databind.ObjectMapper;

‎src/main/java/com/cisco/trex/model/ApiVersionHandler.java‎ renamed to ‎src/main/java/com/cisco/trex/stateless/model/ApiVersionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.cisco.trex.model;
1+
package com.cisco.trex.stateless.model;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.annotation.JsonProperty;

0 commit comments

Comments
 (0)