Fix hiba_authentication, host_certificate test for Nokia (openconfig#5267)

* Fix hiba_authentication, host_certificate test for Nokia

* Fixed static errors

Author: ram-mac

feature/gnsi/credentialz/tests/hiba_authentication/hiba_authentication_test.go

@@ -31,13 +31,13 @@ import (
 )
 
 const (
-	username        = "testuser"
-	maxSSHRetryTime = 30 // Unit is seconds.
+	username               = "testuser"
+	maxSSHRetryTime        = 30 // Unit is seconds.
+	hostCertificateVersion = "v1.0"
 )
 
 var (
 	hostCertificateCreatedOn = time.Now().Unix()
-	hostCertificateVersion   = credz.GenerateVersion()
 )
 
 func TestMain(m *testing.M) {
@@ -134,21 +134,23 @@ func TestCredentialz(t *testing.T) {
 		}
 
 		// Verify host certificate telemetry.
-		sshServer := gnmi.Get(t, dut, gnmi.OC().System().SshServer().State())
-		gotHostCertificateVersion := sshServer.GetActiveHostCertificateVersion()
-		if !cmp.Equal(gotHostCertificateVersion, hostCertificateVersion) {
-			t.Fatalf(
-				"Telemetry reports host certificate version is not correct\n\tgot: %s\n\twant: %s",
-				gotHostCertificateVersion, hostCertificateVersion,
-			)
-		}
-		gotHostCertificateCreatedOn := sshServer.GetActiveHostCertificateCreatedOn()
-		// if !cmp.Equal(time.Unix(0, int64(gotHostCertificateCreatedOn)), time.Unix(hostCertificateCreatedOn, 0)) {
-		if !cmp.Equal(time.Unix(int64(gotHostCertificateCreatedOn), 0), time.Unix(hostCertificateCreatedOn, 0)) {
-			t.Fatalf(
-				"Telemetry reports host certificate created on is not correct\n\tgot: %d\n\twant: %d",
-				gotHostCertificateCreatedOn, hostCertificateCreatedOn,
-			)
+		if !deviations.SSHServerHostCertificateTelemetryUnsupported(dut) {
+			sshServer := gnmi.Get(t, dut, gnmi.OC().System().SshServer().State())
+			gotHostCertificateVersion := sshServer.GetActiveHostCertificateVersion()
+			if !cmp.Equal(gotHostCertificateVersion, hostCertificateVersion) {
+				t.Fatalf(
+					"Telemetry reports host certificate version is not correct\n\tgot: %s\n\twant: %s",
+					gotHostCertificateVersion, hostCertificateVersion,
+				)
+			}
+			gotHostCertificateCreatedOn := sshServer.GetActiveHostCertificateCreatedOn()
+			// if !cmp.Equal(time.Unix(0, int64(gotHostCertificateCreatedOn)), time.Unix(hostCertificateCreatedOn, 0)) {
+			if !cmp.Equal(time.Unix(int64(gotHostCertificateCreatedOn), 0), time.Unix(hostCertificateCreatedOn, 0)) {
+				t.Fatalf(
+					"Telemetry reports host certificate created on is not correct\n\tgot: %d\n\twant: %d",
+					gotHostCertificateCreatedOn, hostCertificateCreatedOn,
+				)
+			}
 		}
 	})
 

feature/gnsi/credentialz/tests/hiba_authentication/metadata.textproto

@@ -11,6 +11,7 @@ platform_exceptions: {
   }
   deviations: {
     ssh_server_counters_unsupported: true
+    ssh_server_host_certificate_telemetry_unsupported: true
   }
 }
 

feature/gnsi/credentialz/tests/host_certificates/host_certificates_test.go

@@ -22,12 +22,12 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/openconfig/ondatra/gnmi"
-
 	"github.com/openconfig/featureprofiles/internal/args"
+	"github.com/openconfig/featureprofiles/internal/deviations"
 	"github.com/openconfig/featureprofiles/internal/fptest"
 	"github.com/openconfig/featureprofiles/internal/security/credz"
 	"github.com/openconfig/ondatra"
+	"github.com/openconfig/ondatra/gnmi"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -92,20 +92,22 @@ func TestCredentialz(t *testing.T) {
 		}
 
 		// Verify host certificate telemetry values.
-		sshServer := gnmi.Get(t, dut, gnmi.OC().System().SshServer().State())
-		gotHostCertificateVersion := sshServer.GetActiveHostCertificateVersion()
-		if !cmp.Equal(gotHostCertificateVersion, hostCertificateVersion) {
-			t.Errorf(
-				"Telemetry reports host certificate version is not correct\n\tgot: %s\n\twant: %s",
-				gotHostCertificateVersion, hostCertificateVersion,
-			)
-		}
-		gotHostCertificateCreatedOn := sshServer.GetActiveHostCertificateCreatedOn()
-		if got, want := gotHostCertificateCreatedOn, hostCertificateCreatedOn; got != want {
-			t.Errorf(
-				"Telemetry reports host certificate created on is not correct\n\twant: %d\n\tgot: %d",
-				want, got,
-			)
+		if !deviations.SSHServerHostCertificateTelemetryUnsupported(dut) {
+			sshServer := gnmi.Get(t, dut, gnmi.OC().System().SshServer().State())
+			gotHostCertificateVersion := sshServer.GetActiveHostCertificateVersion()
+			if !cmp.Equal(gotHostCertificateVersion, hostCertificateVersion) {
+				t.Errorf(
+					"Telemetry reports host certificate version is not correct\n\tgot: %s\n\twant: %s",
+					gotHostCertificateVersion, hostCertificateVersion,
+				)
+			}
+			gotHostCertificateCreatedOn := sshServer.GetActiveHostCertificateCreatedOn()
+			if got, want := gotHostCertificateCreatedOn, hostCertificateCreatedOn; got != want {
+				t.Errorf(
+					"Telemetry reports host certificate created on is not correct\n\twant: %d\n\tgot: %d",
+					want, got,
+				)
+			}
 		}
 	})
 }

feature/gnsi/credentialz/tests/host_certificates/metadata.textproto

@@ -5,3 +5,11 @@ uuid: "91120b0a-91ea-493c-8046-f52176ec2029"
 plan_id: "Credentialz-3"
 description: "Host Certificates"
 testbed: TESTBED_DUT
+platform_exceptions: {
+  platform: {
+    vendor: NOKIA
+  }
+  deviations: {
+    ssh_server_host_certificate_telemetry_unsupported: true
+  }
+}

internal/deviations/deviations.go

@@ -2011,3 +2011,10 @@ func ArpFT(dut *ondatra.DUTDevice) string {
 func PrefixLimitConfigUnsupported(dut *ondatra.DUTDevice) bool {
 	return lookupDUTDeviations(dut).GetPrefixLimitConfigUnsupported()
 }
+
+// SSHServerHostCertificateTelemetryUnsupported returns true if /system/ssh-server/state/active-host-certificate-version
+// is not supported.
+// Nokia: https://partnerissuetracker.corp.google.com/issues/494777653
+func SSHServerHostCertificateTelemetryUnsupported(dut *ondatra.DUTDevice) bool {
+	return lookupDUTDeviations(dut).GetSshServerHostCertificateTelemetryUnsupported()
+}

proto/metadata.proto

@@ -1207,7 +1207,13 @@ message Metadata {
     // Device does not support configuring prefix limit received paths through OC
     // Cisco: https://partnerissuetracker.corp.google.com/issues/447509237
     bool prefix_limit_config_unsupported = 393;
+
+    // SSHServerHostCertificateTelemetryUnsupported returns true if /system/ssh-server/state/active-host-certificate-version
+    // is not supported.
+    // Nokia: https://partnerissuetracker.corp.google.com/issues/494777653
+    bool ssh_server_host_certificate_telemetry_unsupported = 394;
 
+
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 38, 43, 90, 97, 55, 89, 19, 36, 35, 40, 113, 131, 141, 173, 234, 254, 231, 300, 241;
   }