updated pr4t and gribi process names (openconfig#2794)

as part unified grpc server support gribi and p4rt services are moved as
service inside grpc server instance.Also,restart of grpc_server will
restart assosiates services as well.

"This code is a Contribution to the OpenConfig Feature Profiles project ("Work") made under the Google Software Grant and Corporate Contributor License Agreement ("CLA") and governed by the Apache License 2.0. No other rights or licenses in or to any of Nokia's intellectual property are granted for any other purpose. This code is provided on an "as is" basis without any warranties of any kind."

feature/experimental/gribi/otg_tests/dut_daemon_failure/dut_daemon_failure_test.go

@@ -93,7 +93,7 @@ var (
 		ondatra.ARISTA:  "Gribi",
 		ondatra.CISCO:   "emsd",
 		ondatra.JUNIPER: "rpd",
-		ondatra.NOKIA:   "sr_gribi_server",
+		ondatra.NOKIA:   "sr_grpc_server",
 	}
 )
 

feature/p4rt/otg_tests/p4rt_daemon_failure_test/p4rt_daemon_failure_test.go

@@ -85,7 +85,7 @@ var (
 		ondatra.ARISTA:  "P4Runtime",
 		ondatra.CISCO:   "emsd",
 		ondatra.JUNIPER: "p4-switch",
-		ondatra.NOKIA:   "sr_p4rt_server",
+		ondatra.NOKIA:   "sr_grpc_server",
 	}
 )
 
@@ -359,7 +359,7 @@ func TestP4RTDaemonFailure(t *testing.T) {
 	ate.OTG().StopTraffic(t)
 
 	// Skip check for CISCO devices that use the same process for P4RT & gNMI.
-	if dut.Vendor() != ondatra.CISCO {
+	if dut.Vendor() != ondatra.CISCO && dut.Vendor() != ondatra.NOKIA {
 		// Verify interfaceID did not change since the last time we read it.
 		changedID, notOk := watchID.Await(t)
 		if notOk {