Skip to content

Workaround for resource group mode misconfig on tgen #1122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 202405
Choose a base branch
from
Open

Workaround for resource group mode misconfig on tgen #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions dockers/docker-sonic-mgmt/0002-Fix-resource-group.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
From: Vivek Kumar Verma <[email protected]>
Date: Wed May 7 07:11:47 2025 +0000
Subject: [PATCH 1/2] Fix snappi api to retain group mode based on a flag.


diff --git a/snappi_ixnetwork/resourcegroup.py b/snappi_ixnetwork/resourcegroup.py
index 0b57f493..4ff0258d 100644
--- a/snappi_ixnetwork/resourcegroup.py
+++ b/snappi_ixnetwork/resourcegroup.py
@@ -190,7 +190,7 @@ class ResourceGroup(object):
card,
group_id,
current_mode,
- group_mode,
+ group_mode if self._api._retain_group_mode is False else current_mode
)
if l1_name is not None:
if l1_name not in self.layer1_check:
23 changes: 23 additions & 0 deletions dockers/docker-sonic-mgmt/0003-Fix-snappi-api.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From: Vivek Kumar Verma <[email protected]>
Date: Wed May 7 07:12:00 2025 +0000
Subject: [PATCH 2/2]Fix snappi api to retain group mode based on a flag.

diff --git a/snappi_ixnetwork/snappi_api.py b/snappi_ixnetwork/snappi_api.py
index 9a0e49b1..c3301cda 100644
--- a/snappi_ixnetwork/snappi_api.py
+++ b/snappi_ixnetwork/snappi_api.py
@@ -46,6 +46,7 @@ class Api(snappi.Api):
location = kwargs.get("location")
username = kwargs.get("username")
password = kwargs.get("password")
+ self._retain_group_mode = kwargs.get("retain_group_mode", False)
license_servers = kwargs.get("license_servers")
self._log_level = logging.INFO if kwargs.get("loglevel") is None \
else kwargs.get("loglevel")
@@ -1135,4 +1136,4 @@ class Api(snappi.Api):
self.logger.debug(message)

def warning(self, message):
- logging.warning(message)
\ No newline at end of file
+ logging.warning(message)
6 changes: 5 additions & 1 deletion dockers/docker-sonic-mgmt/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,16 @@ USER root
WORKDIR /azp
COPY start.sh \
0001-Fix-getattr-AttributeError-in-multi-thread-scenario.patch \
0002-Fix-resource-group.patch \
0003-Fix-snappi-api.patch \
./
RUN chmod +x start.sh \
&& ln -sf /usr/bin/python3 /usr/bin/python \
&& ln -sf `which pip3` /usr/bin/pip \
&& ln -sf `which pip3` /usr/local/sbin/pip \
&& patch -u -b /usr/local/lib/python3.8/dist-packages/ansible/plugins/loader.py -i /azp/0001-Fix-getattr-AttributeError-in-multi-thread-scenario.patch
&& patch -u -b /usr/local/lib/python3.8/dist-packages/ansible/plugins/loader.py -i /azp/0001-Fix-getattr-AttributeError-in-multi-thread-scenario.patch \
&& patch -u -b /usr/local/lib/python3.8/dist-packages/snappi_ixnetwork/resourcegroup.py -i /azp/0002-Fix-resource-group.patch \
&& patch -u -b /usr/local/lib/python3.8/dist-packages/snappi_ixnetwork/snappi_api.py -i /azp/0003-Fix-snappi-api.patch

USER $user
WORKDIR /var/$user