Skip to content
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.

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

fix(deps): update opi-api digest and api changes #874

Merged
merged 6 commits into from
Jan 23, 2024

Conversation

sandersms
Copy link
Contributor

No description provided.

size: 0,
token: "",
},
// Parent field not in message - depricate test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can just remove this test since there is no parent anymore

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great - I deprecated it to start with but will remove it completely.

0,
"",
},
// Parent field not in message - depricate test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can remove this test

Copy link

codecov bot commented Jan 19, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (457e5eb) 75.02% compared to head (1d6c83b) 74.77%.

Files Patch % Lines
pkg/kvm/nvme.go 50.00% 0 Missing and 1 partial ⚠️
pkg/utils/server.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #874      +/-   ##
==========================================
- Coverage   75.02%   74.77%   -0.25%     
==========================================
  Files          40       40              
  Lines        3699     3699              
==========================================
- Hits         2775     2766       -9     
- Misses        839      845       +6     
- Partials       85       88       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@artek-koltun artek-koltun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I checked this patch thoroughly. We need to update some more lines:

diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go
index e17f870..4aafceb 100644
--- a/pkg/backend/nvme_path.go
+++ b/pkg/backend/nvme_path.go
@@ -273,7 +273,7 @@ func (s *Server) StatsNvmePath(ctx context.Context, in *pb.StatsNvmePathRequest)
 }
 
 func (s *Server) opiTransportToSpdk(transport pb.NvmeTransportType) string {
-       return strings.ReplaceAll(transport.String(), "NVME_TRANSPORT_", "")
+       return strings.ReplaceAll(transport.String(), "NVME_TRANSPORT_TYPE_", "")
 }
 
 func (s *Server) opiMultipathToSpdk(multipath pb.NvmeMultipath) string {
diff --git a/pkg/utils/server.go b/pkg/utils/server.go
index b017426..96e4089 100644
--- a/pkg/utils/server.go
+++ b/pkg/utils/server.go
@@ -148,5 +148,5 @@ func OpiAdressFamilyToSpdk(adrfam pb.NvmeAddressFamily) string {
                return ""
        }
 
-       return strings.ReplaceAll(adrfam.String(), "NVME_ADRFAM_", "")
+       return strings.ReplaceAll(adrfam.String(), "NVME_ADDRESS_FAMILY_", "")
 }

and update godpu sha256 here to 4301eadbb4bd4803eb993a9fd40ae52f132e1c5489996af60777ab320765a8e0
sha256 was taken from here and the CI should pass

@sandersms sandersms marked this pull request as ready for review January 22, 2024 16:30
@sandersms sandersms requested a review from a team as a code owner January 22, 2024 16:30
@sandersms
Copy link
Contributor Author

Ok, I checked this patch thoroughly. We need to update some more lines:

diff --git a/pkg/backend/nvme_path.go b/pkg/backend/nvme_path.go
index e17f870..4aafceb 100644
--- a/pkg/backend/nvme_path.go
+++ b/pkg/backend/nvme_path.go
@@ -273,7 +273,7 @@ func (s *Server) StatsNvmePath(ctx context.Context, in *pb.StatsNvmePathRequest)
 }
 
 func (s *Server) opiTransportToSpdk(transport pb.NvmeTransportType) string {
-       return strings.ReplaceAll(transport.String(), "NVME_TRANSPORT_", "")
+       return strings.ReplaceAll(transport.String(), "NVME_TRANSPORT_TYPE_", "")
 }
 
 func (s *Server) opiMultipathToSpdk(multipath pb.NvmeMultipath) string {
diff --git a/pkg/utils/server.go b/pkg/utils/server.go
index b017426..96e4089 100644
--- a/pkg/utils/server.go
+++ b/pkg/utils/server.go
@@ -148,5 +148,5 @@ func OpiAdressFamilyToSpdk(adrfam pb.NvmeAddressFamily) string {
                return ""
        }
 
-       return strings.ReplaceAll(adrfam.String(), "NVME_ADRFAM_", "")
+       return strings.ReplaceAll(adrfam.String(), "NVME_ADDRESS_FAMILY_", "")
 }

and update godpu sha256 here to 4301eadbb4bd4803eb993a9fd40ae52f132e1c5489996af60777ab320765a8e0 sha256 was taken from here and the CI should pass

I also found a few updates needed in the README file and scripts for the same enums with an extensive search on the entire folder. I added those changes to the PR also.

Copy link
Contributor

@artek-koltun artek-koltun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@artek-koltun artek-koltun merged commit 55e38cf into opiproject:main Jan 23, 2024
17 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants