fixed the TODOs ,notations and comments

openconfig · priyacj · Jan 7, 2025 · Jan 7, 2025 · Jan 9, 2025 · Jan 10, 2025
commit dedd6859e36f6fd235a2804c4098b20f78c53dc0
@@ -14,6 +14,8 @@ Creation of test data for use in TLS tests.
    * server_cert.cnf/server_cert_ext.cnf - server openssl profile configuration
    * client_cert.cnf/client_cert_ext.cnf - client openssl profile configuration
 
+## TODO:Perform this for the permutations of 20000 CA trust_bundle configurations
+
 Each CA set includes, for both RSA and ECDSA signature types:
   * CA key
   * CA public certificate

@@ -8,6 +8,7 @@ identification information. The client certificate should have a
 SPIFFE Idenitifier embedded in it to be used as the identifier of
 the client to the server.
 
+
 ## Baseline Setup
 
 ### Input Args
@@ -42,8 +43,11 @@ gRPC service.
 
 Perform this for both RSA and ECDSA signed CA bundles and
 certificates.
-Perform this for the permutations of 1, 2, 10, 1000, 20000 CA
-trust_bundle configurations: (## indicates the 1, 2, 10, 1000, 20000 CA testdata)
+
+## TODO:Perform this for the permutations of 20000 CA
+## TODO:trust_bundle configurations: ( 20000 CA testdata)
+Perform this for the permutations of 1, 2, 10, 1000 CA
+trust_bundle configurations: (## indicates the 1, 2, 10, 1000 CA testdata)
 
    1) Load the correct key-type trust bundle onto the device and client system:
         ca-##/trust_bundle_##_rsa.pem

@@ -14,7 +14,7 @@
 package client_certificates_test
 
 import (
-	context "context"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"os"

@@ -18,7 +18,7 @@
 package setupservice
 
 import (
-	context "context"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
@@ -147,16 +147,20 @@ func CreateCertzChain(t *testing.T, certData CertificateChainRequest) certzpb.Ce
 				t.Fatalf("Error reading Server Key file at: %v with error: %v", certData.ServerKeyFile, err)
 			}
 			return certzpb.CertificateChain{Certificate: &certzpb.Certificate{
-				Type:        certzpb.CertificateType_CERTIFICATE_TYPE_X509,
-				Encoding:    certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
-				Certificate: serverCertContent,
-				PrivateKey:  serverKeyContent}, Parent: nil}
+				Type:            certzpb.CertificateType_CERTIFICATE_TYPE_X509,
+				Encoding:        certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
+				Certificate:     serverCertContent,
+				PrivateKey:      serverKeyContent,
+				PrivateKeyType:  &certzpb.Certificate_RawPrivateKey{RawPrivateKey: serverKeyContent},
+				CertificateType: &certzpb.Certificate_RawCertificate{RawCertificate: serverCertContent}}, Parent: nil}
 		}
 		return certzpb.CertificateChain{Certificate: &certzpb.Certificate{
-			Type:        certzpb.CertificateType_CERTIFICATE_TYPE_X509,
-			Encoding:    certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
-			Certificate: serverCertContent,
-			PrivateKey:  nil}, Parent: nil}
+			Type:            certzpb.CertificateType_CERTIFICATE_TYPE_X509,
+			Encoding:        certzpb.CertificateEncoding_CERTIFICATE_ENCODING_PEM,
+			Certificate:     serverCertContent,
+			PrivateKey:      nil,
+			PrivateKeyType:  nil,
+			CertificateType: &certzpb.Certificate_RawCertificate{RawCertificate: serverCertContent}}, Parent: nil}
 
 	case EntityTypeTrustBundle:
 		if len(certData.TrustBundleFile) == 0 {

diff --git a/internal/otg_helpers/otg_config_helpers/otgconfighelpers.go b/internal/otg_helpers/otg_config_helpers/otgconfighelpers.go
 }

 // ConfigureOtgInterface configures the Ethernet for the LAG or subinterface.
 func ConfigureOtgInterface(t *testing.T, top gosnappi.Config, intf *InterfaceProperties, a *Port) {
 	dev := top.Devices().Add().SetName(intf.Name + ".Dev")
 	eth := dev.Ethernets().Add().SetName(intf.Name + ".Eth").SetMac(intf.Mac)
 	if a.Islag {
diff --git a/internal/cfgplugins/bgp_policy.go b/internal/cfgplugins/bgp_policy.go
 	"github.com/openconfig/ondatra"
 )

 // DeviationCiscoRoutingPolicyBGPActionSetCommunity is used as an alternative to
 // /routing-policy/policy-definitions/policy-definition/statements/statement/actions/bgp-actions/config/set-med.
 // This deviation implements CLI to perform the equivalent function.
 func DeviationCiscoRoutingPolicyBGPActionSetMed(t *testing.T, dut *ondatra.DUTDevice, policyName string, statement string, prefixSetName string, setMed int, origin string) {
diff --git a/internal/fptest/config.go b/internal/fptest/config.go
 		t.Fatalf("Cannot copy baseConfig: %v", err)
 	}

 	copy := o.(*oc.Root)

 	if *setEthernetFromState {
 		setEthernetFromBase(t, config, copy)
	}

	// ConfigureOtgInterface configures the Ethernet for the LAG or subinterface.
	func ConfigureOtgInterface(t testing.T, top gosnappi.Config, intf InterfaceProperties, a *Port) {
Check failure on line 96 in internal/otg_helpers/otg_config_helpers/otgconfighelpers.go GitHub Actions / Static Analysis `parameter 't' seems to be unused, consider removing or renaming it as _`
	dev := top.Devices().Add().SetName(intf.Name + ".Dev")
	eth := dev.Ethernets().Add().SetName(intf.Name + ".Eth").SetMac(intf.Mac)
	if a.Islag {
	"github.com/openconfig/ondatra"
	)

	// DeviationCiscoRoutingPolicyBGPActionSetCommunity is used as an alternative to
Check failure on line 25 in internal/cfgplugins/bgp_policy.go GitHub Actions / Static Analysis `comment on exported function DeviationCiscoRoutingPolicyBGPActionSetMed should be of the form "DeviationCiscoRoutingPolicyBGPActionSetMed ..."`
	// /routing-policy/policy-definitions/policy-definition/statements/statement/actions/bgp-actions/config/set-med.
	// This deviation implements CLI to perform the equivalent function.
	func DeviationCiscoRoutingPolicyBGPActionSetMed(t testing.T, dut ondatra.DUTDevice, policyName string, statement string, prefixSetName string, setMed int, origin string) {
	t.Fatalf("Cannot copy baseConfig: %v", err)
	}

	copy := o.(*oc.Root)
Check failure on line 175 in internal/fptest/config.go GitHub Actions / Static Analysis `redefinition of the built-in function copy`

	if *setEthernetFromState {
	setEthernetFromBase(t, config, copy)