Skip to content

Commit

Permalink
Merge pull request #205 from open-traffic-generator/dev-7th-august
Browse files Browse the repository at this point in the history 
Release v1.7.2-1
  • Loading branch information
@biplamal
biplamal authored Aug 7, 2024
2 parents 6c92811 + 019a2ab commit beea691
Show file tree
Hide file tree
Showing 14 changed files with 267 additions and 2,694 deletions.
2 changes: 1 addition & 1 deletion conformance
Submodule conformance updated 7 files
+2 −0 deployments/k8s/manifests/ixia-c-b2b-eth0.yaml
+4 −2 deployments/template-ixia-c-config.yaml
+7 −1 do.sh
+9 −8 go.mod
+19 −2,467 go.sum
+1 −1 requirements.txt
+5 −5 versions.yaml
8 changes: 4 additions & 4 deletions deployments/k8s/components/images/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

# Release: https://github.com/open-traffic-generator/ixia-c/releases/tag/v1.6.2-1
# Release: https://github.com/open-traffic-generator/ixia-c/releases/tag/v1.7.2-1
images:
- name: keng-controller
newName: ghcr.io/open-traffic-generator/keng-controller
newTag: "1.6.2-13"
newTag: "1.7.2-1"
- name: otg-gnmi-server
newName: ghcr.io/open-traffic-generator/otg-gnmi-server
newTag: "1.14.6"
newTag: "1.14.7"
- name: ixia-c-traffic-engine
newName: ghcr.io/open-traffic-generator/ixia-c-traffic-engine
newTag: "1.8.0.12"
newTag: "1.8.0.25"
14 changes: 8 additions & 6 deletions deployments/k8s/network-emulation/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@ module ipfwd

go 1.19

require github.com/open-traffic-generator/snappi/gosnappi v1.6.2
require github.com/open-traffic-generator/snappi/gosnappi v1.7.2

require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/grpc v1.64.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.2.3 // indirect
)
2,634 changes: 14 additions & 2,620 deletions deployments/k8s/network-emulation/go.sum
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions deployments/k8s/network-emulation/ipfwd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func main() {
api.NewHttpTransport().SetLocation(testConst["apiLocation"].(string)).SetVerify(false)

log.Println("Constructing OTG configuration ...")
c := otgConfig(api, testConst)
c := otgConfig(testConst)

log.Println("Pushing OTG configuration ...")
if wrn, err := api.SetConfig(c); err != nil {
Expand Down Expand Up @@ -74,7 +74,7 @@ func main() {
}
}

func otgConfig(api gosnappi.GosnappiApi, tc map[string]interface{}) gosnappi.Config {
func otgConfig(tc map[string]interface{}) gosnappi.Config {
c := gosnappi.NewConfig()

ptx := c.Ports().Add().SetName("ptx").SetLocation(tc["txPortLocation"].(string))
Expand Down Expand Up @@ -142,7 +142,7 @@ func otgConfig(api gosnappi.GosnappiApi, tc map[string]interface{}) gosnappi.Con
return c
}

func ipNeighborsOk(api gosnappi.GosnappiApi, tc map[string]interface{}) bool {
func ipNeighborsOk(api gosnappi.Api, tc map[string]interface{}) bool {
count := 0

log.Println("Getting IPv4 neighbors ...")
Expand All @@ -168,7 +168,7 @@ func ipNeighborsOk(api gosnappi.GosnappiApi, tc map[string]interface{}) bool {
return count == 2
}

func flowMetricsOk(api gosnappi.GosnappiApi, tc map[string]interface{}) bool {
func flowMetricsOk(api gosnappi.Api, tc map[string]interface{}) bool {
pktCount := uint64(tc["pktCount"].(uint32))

log.Println("Getting flow metrics ...")
Expand Down
10 changes: 5 additions & 5 deletions deployments/k8s/network-emulation/pods.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
- args:
- --accept-eula
- --debug
image: ghcr.io/open-traffic-generator/keng-controller:1.6.2-13
image: ghcr.io/open-traffic-generator/keng-controller:1.7.2-1
imagePullPolicy: IfNotPresent
name: keng-controller
volumeMounts:
Expand Down Expand Up @@ -63,15 +63,15 @@ spec:
value: "5555"
- name: ARG_CORE_LIST
value: 1 1 1
image: ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.12
image: ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.25
imagePullPolicy: IfNotPresent
name: ixia-c-port1-traffic-engine
securityContext:
privileged: true
- env:
- name: INTF_LIST
value: eth1
image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.390
image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.392
imagePullPolicy: IfNotPresent
name: ixia-c-port1-protocol-engine
securityContext:
Expand Down Expand Up @@ -99,15 +99,15 @@ spec:
value: "5555"
- name: ARG_CORE_LIST
value: 1 1 1
image: ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.12
image: ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.25
imagePullPolicy: IfNotPresent
name: ixia-c-port2-traffic-engine
securityContext:
privileged: true
- env:
- name: INTF_LIST
value: eth2
image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.390
image: ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.392
imagePullPolicy: IfNotPresent
name: ixia-c-port2-protocol-engine
securityContext:
Expand Down
12 changes: 6 additions & 6 deletions deployments/k8s/network-emulation/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ To achieve this, we'll be using [Meshnet CNI](https://github.com/networkop/meshn
docker login ghcr.io
# download ixia-c images
docker pull ghcr.io/open-traffic-generator/keng-controller:1.6.2-13
docker pull ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.12
docker pull ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.390
docker pull ghcr.io/open-traffic-generator/keng-controller:1.7.2-1
docker pull ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.25
docker pull ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.392
# download DUT image
docker pull ubuntu:22.04
Expand All @@ -80,9 +80,9 @@ To achieve this, we'll be using [Meshnet CNI](https://github.com/networkop/meshn
docker pull networkop/init-wait:latest
# push images to nodes
kind load docker-image ghcr.io/open-traffic-generator/keng-controller:1.6.2-13
kind load docker-image ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.12
kind load docker-image ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.390
kind load docker-image ghcr.io/open-traffic-generator/keng-controller:1.7.2-1
kind load docker-image ghcr.io/open-traffic-generator/ixia-c-traffic-engine:1.8.0.25
kind load docker-image ghcr.io/open-traffic-generator/ixia-c-protocol-engine:1.00.0.392
kind load docker-image ubuntu:22.04
kind load docker-image networkop/meshnet:latest
kind load docker-image networkop/init-wait:latest
Expand Down
26 changes: 13 additions & 13 deletions docs/deployments-kne.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,32 @@ Following are the recommended resources for a basic use-case.
data:
versions: |
{
"release": "1.6.2-13",
"release": "1.7.2-1",
"images": [
{
"name": "controller",
"path": "ghcr.io/open-traffic-generator/keng-controller",
"tag": "1.6.2-13"
"tag": "1.7.2-1"
},
{
"name": "gnmi-server",
"path": "ghcr.io/open-traffic-generator/otg-gnmi-server",
"tag": "1.14.6"
"tag": "1.14.7"
},
{
"name": "traffic-engine",
"path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine",
"tag": "1.8.0.12"
"tag": "1.8.0.25"
},
{
"name": "protocol-engine",
"path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine",
"tag": "1.00.0.390"
"tag": "1.00.0.392"
},
{
"name": "ixhw-server",
"path": "ghcr.io/open-traffic-generator/keng-layer23-hw-server",
"tag": "1.6.2-4"
"tag": "1.7.1-4"
}
]
}
Expand All @@ -100,35 +100,35 @@ Following are the recommended resources for a basic use-case.
data:
versions: |
{
"release": "1.6.2-13",
"release": "1.7.2-1",
"images": [
{
"name": "controller",
"path": "ghcr.io/open-traffic-generator/keng-controller",
"tag": "1.6.2-13",
"tag": "1.7.2-1",
"env": {
"LICENSE_SERVERS": "ip/hostname of license server"
}
},
{
"name": "gnmi-server",
"path": "ghcr.io/open-traffic-generator/otg-gnmi-server",
"tag": "1.14.6"
"tag": "1.14.7"
},
{
"name": "traffic-engine",
"path": "ghcr.io/open-traffic-generator/ixia-c-traffic-engine",
"tag": "1.8.0.12"
"tag": "1.8.0.25"
},
{
"name": "protocol-engine",
"path": "ghcr.io/open-traffic-generator/ixia-c-protocol-engine",
"tag": "1.00.0.390"
"tag": "1.00.0.392"
},
{
"name": "ixhw-server",
"path": "ghcr.io/open-traffic-generator/keng-layer23-hw-server",
"tag": "1.6.2-4"
"tag": "1.7.1-4"
}
]
}
Expand All @@ -148,7 +148,7 @@ Following are the recommended resources for a basic use-case.
nodes:
- name: otg
vendor: KEYSIGHT
version: 1.6.2-13
version: 1.7.2-1
services:
8443:
name: https
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/hello-snappi.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ After the set up is completed, install the python packages:
* [dpkt](https://pypi.org/project/dpkt/) - for processing `.pcap` files.

```sh
python -m pip install --upgrade snappi==1.6.2 dpkt
python -m pip install --upgrade snappi==1.7.2 dpkt
```

## Create the API Handle
Expand Down
4 changes: 4 additions & 0 deletions docs/news.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# News

* **7th August, 2024**: Ixia-c version 1.7.2 (build 1) released. This conforms to **[v1.7.1](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/open-traffic-generator/models/v1.7.1/artifacts/openapi.yaml)** of the Open Traffic Generator Models specification.

* This build includes new features and bug fixes. [Read more](releases.md)

* **19th July, 2024**: Ixia-c version 1.6.2 (build 13) released. This conforms to **[v1.6.2](https://redocly.github.io/redoc/?url=https://raw.githubusercontent.com/open-traffic-generator/models/v1.6.2/artifacts/openapi.yaml)** of the Open Traffic Generator Models specification.

* This build includes new features and bug fixes. [Read more](releases.md)
Expand Down
Loading

0 comments on commit beea691

Please sign in to comment.