NS_Emulation: Support multiple NS-VC within one NSE (NS-VCG)

This is something we need to simulate more complex scenarios,
particularly in the context of frame relay.

Change-Id: If1220852785853f8a5d8de183d5053ddd6ccb958
diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg
index c4e1a33..4f92ac2 100644
--- a/sgsn/SGSN_Tests.cfg
+++ b/sgsn/SGSN_Tests.cfg
@@ -14,29 +14,41 @@
 [MODULE_PARAMETERS]
 SGSN_Tests.mp_nsconfig := {
 	{
-		provider := {
-			ip := {
-				address_family := AF_INET,
-				local_ip := "127.0.0.103",
-				remote_ip := "127.0.0.10"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "127.0.0.103",
+						remote_ip := "127.0.0.10"
+					}
+				}
 			}
 		}
 	},
 	{
-		provider := {
-			ip := {
-				address_family := AF_INET,
-				local_ip := "127.0.0.103",
-				remote_ip := "127.0.0.10"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "127.0.0.103",
+						remote_ip := "127.0.0.10"
+					}
+				}
 			}
 		}
 	},
 	{
-		provider := {
-			ip := {
-				address_family := AF_INET,
-				local_ip := "127.0.0.103",
-				remote_ip := "127.0.0.10"
+		nsvc := {
+			{
+				provider := {
+					ip := {
+						address_family := AF_INET,
+						local_ip := "127.0.0.103",
+						remote_ip := "127.0.0.10"
+					}
+				}
 			}
 		}
 	}
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 53ecdff..a602b21 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -69,49 +69,61 @@
 
 	NSConfigurations mp_nsconfig := {
 		{
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_udp_port := 21010,
-					local_ip := "127.0.0.1",
-					remote_udp_port := 23000,
-					remote_ip := "127.0.0.1"
-				}
-			},
-			nsvci := 97,
 			nsei := 96,
 			role_sgsn := false,
-			handle_sns := false
+			handle_sns := false,
+			nsvc := {
+				{
+					provider := {
+						ip := {
+							address_family := AF_INET,
+							local_udp_port := 21010,
+							local_ip := "127.0.0.1",
+							remote_udp_port := 23000,
+							remote_ip := "127.0.0.1"
+						}
+					},
+					nsvci := 97
+				}
+			}
 		},
 		{
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_udp_port := 21011,
-					local_ip := "127.0.0.1",
-					remote_udp_port := 23000,
-					remote_ip := "127.0.0.1"
-				}
-			},
-			nsvci := 98,
 			nsei := 97,
 			role_sgsn := false,
-			handle_sns := false
+			handle_sns := false,
+			nsvc := {
+				{
+					provider := {
+						ip := {
+							address_family := AF_INET,
+							local_udp_port := 21011,
+							local_ip := "127.0.0.1",
+							remote_udp_port := 23000,
+							remote_ip := "127.0.0.1"
+						}
+					},
+					nsvci := 98
+				}
+			}
 		},
 		{
-			provider := {
-				ip := {
-					address_family := AF_INET,
-					local_udp_port := 21012,
-					local_ip := "127.0.0.1",
-					remote_udp_port := 23000,
-					remote_ip := "127.0.0.1"
-				}
-			},
-			nsvci := 99,
 			nsei := 98,
 			role_sgsn := false,
-			handle_sns := false
+			handle_sns := false,
+			nsvc := {
+				{
+					provider := {
+						ip := {
+							address_family := AF_INET,
+							local_udp_port := 21012,
+							local_ip := "127.0.0.1",
+							remote_udp_port := 23000,
+							remote_ip := "127.0.0.1"
+						}
+					},
+					nsvci := 99
+				}
+			}
 		}
 	};