fixed CI

open-traffic-generator · Oct 20, 2023 · 38e0540 · 38e0540
1 parent 070fed8
commit 38e0540
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/deployments/k8s/network-emulation/ipfwd.go b/deployments/k8s/network-emulation/ipfwd.go
@@ -20,17 +20,17 @@ func main() {
 		"txPortLocation": "eth1",
 		"rxPortLocation": "eth2",
 		"speed":          "speed_1_gbps",
-		"pktRate":        int64(50),
-		"pktCount":       int32(100),
-		"pktSize":        int32(128),
+		"pktRate":        uint64(50),
+		"pktCount":       uint32(100),
+		"pktSize":        uint32(128),
 		"txMac":          "00:00:01:01:01:01",
 		"txIp":           "1.1.1.1",
 		"txGateway":      "1.1.1.2",
-		"txPrefix":       int32(24),
+		"txPrefix":       uint32(24),
 		"rxMac":          "00:00:01:01:01:02",
 		"rxIp":           "2.2.2.1",
 		"rxGateway":      "2.2.2.2",
-		"rxPrefix":       int32(24),
+		"rxPrefix":       uint32(24),
 	}
 
 	api := gosnappi.NewApi()
@@ -102,7 +102,7 @@ func otgConfig(api gosnappi.GosnappiApi, tc map[string]interface{}) gosnappi.Con
 		SetName("dtxIp").
 		SetAddress(tc["txIp"].(string)).
 		SetGateway(tc["txGateway"].(string)).
-		SetPrefix(tc["txPrefix"].(int32))
+		SetPrefix(tc["txPrefix"].(uint32))
 
 	drxEth := drx.Ethernets().
 		Add().
@@ -118,13 +118,13 @@ func otgConfig(api gosnappi.GosnappiApi, tc map[string]interface{}) gosnappi.Con
 		SetName("drxIp").
 		SetAddress(tc["rxIp"].(string)).
 		SetGateway(tc["rxGateway"].(string)).
-		SetPrefix(tc["rxPrefix"].(int32))
+		SetPrefix(tc["rxPrefix"].(uint32))
 
 	flow := c.Flows().Add()
 	flow.SetName("ftxV4")
-	flow.Duration().FixedPackets().SetPackets(tc["pktCount"].(int32))
-	flow.Rate().SetPps(tc["pktRate"].(int64))
-	flow.Size().SetFixed(tc["pktSize"].(int32))
+	flow.Duration().FixedPackets().SetPackets(tc["pktCount"].(uint32))
+	flow.Rate().SetPps(tc["pktRate"].(uint64))
+	flow.Size().SetFixed(tc["pktSize"].(uint32))
 	flow.Metrics().SetEnable(true)
 
 	flow.TxRx().Device().
@@ -169,7 +169,7 @@ func ipNeighborsOk(api gosnappi.GosnappiApi, tc map[string]interface{}) bool {
 }
 
 func flowMetricsOk(api gosnappi.GosnappiApi, tc map[string]interface{}) bool {
-	pktCount := int64(tc["pktCount"].(int32))
+	pktCount := uint64(tc["pktCount"].(uint32))
 
 	log.Println("Getting flow metrics ...")
 	req := api.NewMetricsRequest()

diff --git a/deployments/k8s/readme.md b/deployments/k8s/readme.md
@@ -43,7 +43,7 @@ This section hosts [kustomize](https://kustomize.io/) manifests for deploying va
     for i in $(seq $(grep -c newName ${yml}))
     do
         cap=$(grep -A1 -m${i} newName ${yml} | tail -n 2)
-        img=$(grep -A1 -m${i} newName ${yml} | tail -n 2 | grep newName | cut -d\  -f4)
+        img=$(grep -A1 -m${i} newName ${yml} | tail -n 2 | grep newName | cut -d: -f2 | cut -d\  -f2)
         img=${img}:$(grep -A1 -m${i} newName ${yml} | tail -n 2 | grep newTag | cut -d\" -f2)
         docker pull "${img}" && kind load docker-image "${img}"
     done

diff --git a/docs/limitations.md b/docs/limitations.md
@@ -3,7 +3,7 @@
 * [Table of Contents](readme.md)
 
 * Supported protocol headers are `ethernet`, `ipv4`, `ipv6`, `vlan`, `tcp`, `udp`, `gtpv1`, `gtpv2`, `arp`, `icmp` and `custom`.
-* `fixed_packets`, `fixed_seconds`,`continuous` and 'burst' are supported for flow duration (fixed number of 'burst' is not supported).
+* `fixed_packets`, `fixed_seconds`,`continuous` and `burst` are supported for flow duration (fixed number of `burst` is not supported).
 * Size of the packet must be a value greater than or equal to 64 bytes.
 * Setting random frame size is not supported.
 * Only `value`, `values`,`increment` and `decrement` patterns are supported for Protocol Header fields.

diff --git a/docs/roadmap.md b/docs/roadmap.md
@@ -2,6 +2,5 @@
 
 Ixia-c is released periodically.  This page does NOT list all the minor/bug-fix releases that are planned.
 
-The next major release of Ixia-c will be version 0.1.0.  This release will align to v0.4.0 of the [Open Traffic Generator Data Models](https://github.com/open-traffic-generator/models).  The biggest feature in this release will be the ability to disable packet instrumentation.  This change WILL BE backwards incompatible.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,5 @@

		Ixia-c is released periodically. This page does NOT list all the minor/bug-fix releases that are planned.

		The next major release of Ixia-c will be version 0.1.0. This release will align to v0.4.0 of the [Open Traffic Generator Data Models](https://github.com/open-traffic-generator/models). The biggest feature in this release will be the ability to disable packet instrumentation. This change WILL BE backwards incompatible.