diff --git a/internal/fptest/runtests.go b/internal/fptest/runtests.go index 6b300edd7cd..2076660b9b1 100644 --- a/internal/fptest/runtests.go +++ b/internal/fptest/runtests.go @@ -92,6 +92,7 @@ func testbedPathFromMetadata() (string, error) { mpb.Metadata_TESTBED_DUT_8_LOOP_2_ATE: "dut_8_loop_2_ate.testbed", mpb.Metadata_TESTBED_ATE_DUT1_4LINKS_DUT2_ATE: "ate_dut1_4links_dut2_ate.testbed", mpb.Metadata_TESTBED_DUT_DUT_ATE_8LINKS: "dutdutate_8.testbed", + mpb.Metadata_TESTBED_DUT_1_LOOP_2_ATE: "dut_1_loop_2_ate.testbed", } testbedFile, ok := testbedToFile[testbed] if !ok { diff --git a/proto/metadata.proto b/proto/metadata.proto index edc903ed912..12395450391 100644 --- a/proto/metadata.proto +++ b/proto/metadata.proto @@ -50,6 +50,7 @@ message Metadata { TESTBED_DUT_8_LOOP_2_ATE = 18; TESTBED_ATE_DUT1_4LINKS_DUT2_ATE = 19; TESTBED_DUT_DUT_ATE_8LINKS = 20; + TESTBED_DUT_1_LOOP_2_ATE = 21; } // Testbed on which the test is intended to run. Testbed testbed = 4; diff --git a/proto/metadata_go_proto/metadata.pb.go b/proto/metadata_go_proto/metadata.pb.go index 1108dce7790..e896495ccc2 100644 --- a/proto/metadata_go_proto/metadata.pb.go +++ b/proto/metadata_go_proto/metadata.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.12 -// protoc (unknown) +// protoc v6.33.1 // source: metadata.proto package metadata_go_proto @@ -62,6 +62,7 @@ const ( Metadata_TESTBED_DUT_8_LOOP_2_ATE Metadata_Testbed = 18 Metadata_TESTBED_ATE_DUT1_4LINKS_DUT2_ATE Metadata_Testbed = 19 Metadata_TESTBED_DUT_DUT_ATE_8LINKS Metadata_Testbed = 20 + Metadata_TESTBED_DUT_1_LOOP_2_ATE Metadata_Testbed = 21 ) // Enum value maps for Metadata_Testbed. @@ -88,6 +89,7 @@ var ( 18: "TESTBED_DUT_8_LOOP_2_ATE", 19: "TESTBED_ATE_DUT1_4LINKS_DUT2_ATE", 20: "TESTBED_DUT_DUT_ATE_8LINKS", + 21: "TESTBED_DUT_1_LOOP_2_ATE", } Metadata_Testbed_value = map[string]int32{ "TESTBED_UNSPECIFIED": 0, @@ -111,6 +113,7 @@ var ( "TESTBED_DUT_8_LOOP_2_ATE": 18, "TESTBED_ATE_DUT1_4LINKS_DUT2_ATE": 19, "TESTBED_DUT_DUT_ATE_8LINKS": 20, + "TESTBED_DUT_1_LOOP_2_ATE": 21, } ) @@ -4932,7 +4935,7 @@ var File_metadata_proto protoreflect.FileDescriptor const file_metadata_proto_rawDesc = "" + "\n" + - "\x0emetadata.proto\x12\x12openconfig.testing\x1a1github.com/openconfig/ondatra/proto/testbed.proto\"\x91\x94\x02\n" + + "\x0emetadata.proto\x12\x12openconfig.testing\x1a1github.com/openconfig/ondatra/proto/testbed.proto\"\xaf\x94\x02\n" + "\bMetadata\x12\x12\n" + "\x04uuid\x18\x01 \x01(\tR\x04uuid\x12\x17\n" + "\aplan_id\x18\x02 \x01(\tR\x06planId\x12 \n" + @@ -5408,7 +5411,7 @@ const file_metadata_proto_rawDesc = "" + "\bplatform\x18\x01 \x01(\v2%.openconfig.testing.Metadata.PlatformR\bplatform\x12G\n" + "\n" + "deviations\x18\x02 \x01(\v2'.openconfig.testing.Metadata.DeviationsR\n" + - "deviations\"\xe4\x04\n" + + "deviations\"\x82\x05\n" + "\aTestbed\x12\x17\n" + "\x13TESTBED_UNSPECIFIED\x10\x00\x12\x0f\n" + "\vTESTBED_DUT\x10\x01\x12\x1a\n" + @@ -5431,7 +5434,8 @@ const file_metadata_proto_rawDesc = "" + "\x1aTESTBED_DUT_ATE_8LINKS_LAG\x10\x11\x12\x1c\n" + "\x18TESTBED_DUT_8_LOOP_2_ATE\x10\x12\x12$\n" + " TESTBED_ATE_DUT1_4LINKS_DUT2_ATE\x10\x13\x12\x1e\n" + - "\x1aTESTBED_DUT_DUT_ATE_8LINKS\x10\x14\"m\n" + + "\x1aTESTBED_DUT_DUT_ATE_8LINKS\x10\x14\x12\x1c\n" + + "\x18TESTBED_DUT_1_LOOP_2_ATE\x10\x15\"m\n" + "\x04Tags\x12\x14\n" + "\x10TAGS_UNSPECIFIED\x10\x00\x12\x14\n" + "\x10TAGS_AGGREGATION\x10\x01\x12\x18\n" + diff --git a/topologies/dut_1_loop_2_ate.testbed b/topologies/dut_1_loop_2_ate.testbed new file mode 100644 index 00000000000..c64bc8124fd --- /dev/null +++ b/topologies/dut_1_loop_2_ate.testbed @@ -0,0 +1,47 @@ +# proto-file: github.com/openconfig/ondatra/blob/main/proto/testbed.proto +# proto-message: ondatra.Testbed + +# This testbed provides a DUT with 1 physical loop (dut:port2 <-> dut:port3) +# and an ATE with 2 links to the DUT (ate:port1 <-> dut:port1 and +# ate:port2 <-> dut:port4). + +duts { + id: "dut" + ports { + id: "port1" + } + ports { + id: "port2" + } + ports { + id: "port3" + } + ports { + id: "port4" + } +} + +ates { + id: "ate" + ports { + id: "port1" + } + ports { + id: "port2" + } +} + +links { + a: "dut:port1" + b: "ate:port1" +} + +links { + a: "dut:port2" + b: "dut:port3" +} + +links { + a: "dut:port4" + b: "ate:port2" +}