osmo-ttcn3-hacks[master]: More progress on osmo-sip-connector tests

2018-03-26 Thread Harald Welte

Patch Set 2: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/7466
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I34a5d7929264c7f5f21d3868a5f919874ffa106c
Gerrit-PatchSet: 2
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-HasComments: No


[MERGED] osmo-ttcn3-hacks[master]: More progress on osmo-sip-connector tests

2018-03-26 Thread Harald Welte
Harald Welte has submitted this change and it was merged.

Change subject: More progress on osmo-sip-connector tests
..


More progress on osmo-sip-connector tests

Change-Id: I34a5d7929264c7f5f21d3868a5f919874ffa106c
---
M library/MNCC_Types.ttcn
M library/SIP_Emulation.ttcn
A library/SIP_Templates.ttcn
M sip/SIP_Tests.cfg
M sip/SIP_Tests.default
M sip/SIP_Tests.ttcn
M sip/gen_links.sh
7 files changed, 798 insertions(+), 47 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 39f9dce..19af236 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -512,6 +512,39 @@
}
}
 };
+template MNCC_PDU tr_MNCC_SETUP_req(template uint32_t call_id := ?,
+   template charstring called := ?,
+   template charstring calling := *,
+   template charstring imsi := ?) := {
+   msg_type := MNCC_SETUP_REQ,
+   u := {
+   signal := { /* See 24.008 9.3.23.1 */
+   callref := call_id,
+   bearer_cap := *,/* 
mandatory in CC */
+   called := tr_MNCC_number(called),   /* 
optional */
+   calling := tr_MNCC_number(calling), /* 
optional */
+   redirecting := *,   /* 
optional */
+   connected := omit,
+   cause := omit,
+   progress := *,  /* 
optional */
+   useruser := *,  /* 
optional */
+   facility := *,  /* 
optional */
+   cccap := omit,
+   ssversion := omit,
+   clir_sup := 0,
+   clir_inv := 0,
+   signal := *,/* 
optional */
+   keypad := omit,
+   more := 0,
+   notify := 0,
+   emergency := *,
+   imsi := imsi,
+   lchan_type := ?,
+   lchan_mode := ?
+   }
+   }
+};
+
 
 /* MO: MSC <- MNCC: Respons to SETUP.ind */
 template MNCC_PDU ts_MNCC_SETUP_rsp(uint32_t call_id, charstring imsi := "",
@@ -653,9 +686,9 @@
redirecting := omit,
connected := connected,
cause := omit,
-   progress := *,
-   useruser := *,
-   facility := *,
+   progress := omit,
+   useruser := omit,
+   facility := omit,
cccap := omit,
ssversion := omit,
clir_sup := 0,
@@ -664,10 +697,10 @@
keypad := omit,
more := 0,
notify := 0,
-   emergency := *,
+   emergency := omit,
imsi := "",
-   lchan_type := ?,
-   lchan_mode := ?
+   lchan_type := 0,
+   lchan_mode := 0
}
}
 }
@@ -807,6 +840,39 @@
}
}
 }
+template MNCC_PDU ts_MNCC_CALL_CONF_ind(uint32_t call_id,
+   template (omit) MNCC_bearer_cap bcap := 
omit,
+   template (omit) MNCC_cause cause := 
omit,
+   template (omit) MNCC_cccap cccap := 
omit) := {
+   msg_type := MNCC_CALL_CONF_IND,
+   u := {
+   signal := { /* See 24.008 9.3.2 */
+   callref := call_id,
+   bearer_cap := bcap,
+   called := omit,
+   calling := omit,
+   redirecting := omit,
+   connected := omit,
+   cause := cause,
+   progress := omit,
+   useruser := omit,
+   facility := omit,
+   cccap := cccap,
+   ssversion := omit,
+   clir_sup := 0,
+   clir_inv := 0,
+   signal := omit,
+   keypad := omit,
+   more := 0,
+   notify := 0,
+   emergency := omit,
+   imsi := "",
+   lchan_type := 0,
+   lchan_mode := 0
+   }
+   }
+}
+
 
 /* MO: 

[PATCH] osmo-ttcn3-hacks[master]: More progress on osmo-sip-connector tests

2018-03-26 Thread Harald Welte
Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/7466

to look at the new patch set (#2).

More progress on osmo-sip-connector tests

Change-Id: I34a5d7929264c7f5f21d3868a5f919874ffa106c
---
M library/MNCC_Types.ttcn
M library/SIP_Emulation.ttcn
A library/SIP_Templates.ttcn
M sip/SIP_Tests.cfg
M sip/SIP_Tests.default
M sip/SIP_Tests.ttcn
M sip/gen_links.sh
7 files changed, 798 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/66/7466/2

diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 39f9dce..19af236 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -512,6 +512,39 @@
}
}
 };
+template MNCC_PDU tr_MNCC_SETUP_req(template uint32_t call_id := ?,
+   template charstring called := ?,
+   template charstring calling := *,
+   template charstring imsi := ?) := {
+   msg_type := MNCC_SETUP_REQ,
+   u := {
+   signal := { /* See 24.008 9.3.23.1 */
+   callref := call_id,
+   bearer_cap := *,/* 
mandatory in CC */
+   called := tr_MNCC_number(called),   /* 
optional */
+   calling := tr_MNCC_number(calling), /* 
optional */
+   redirecting := *,   /* 
optional */
+   connected := omit,
+   cause := omit,
+   progress := *,  /* 
optional */
+   useruser := *,  /* 
optional */
+   facility := *,  /* 
optional */
+   cccap := omit,
+   ssversion := omit,
+   clir_sup := 0,
+   clir_inv := 0,
+   signal := *,/* 
optional */
+   keypad := omit,
+   more := 0,
+   notify := 0,
+   emergency := *,
+   imsi := imsi,
+   lchan_type := ?,
+   lchan_mode := ?
+   }
+   }
+};
+
 
 /* MO: MSC <- MNCC: Respons to SETUP.ind */
 template MNCC_PDU ts_MNCC_SETUP_rsp(uint32_t call_id, charstring imsi := "",
@@ -653,9 +686,9 @@
redirecting := omit,
connected := connected,
cause := omit,
-   progress := *,
-   useruser := *,
-   facility := *,
+   progress := omit,
+   useruser := omit,
+   facility := omit,
cccap := omit,
ssversion := omit,
clir_sup := 0,
@@ -664,10 +697,10 @@
keypad := omit,
more := 0,
notify := 0,
-   emergency := *,
+   emergency := omit,
imsi := "",
-   lchan_type := ?,
-   lchan_mode := ?
+   lchan_type := 0,
+   lchan_mode := 0
}
}
 }
@@ -807,6 +840,39 @@
}
}
 }
+template MNCC_PDU ts_MNCC_CALL_CONF_ind(uint32_t call_id,
+   template (omit) MNCC_bearer_cap bcap := 
omit,
+   template (omit) MNCC_cause cause := 
omit,
+   template (omit) MNCC_cccap cccap := 
omit) := {
+   msg_type := MNCC_CALL_CONF_IND,
+   u := {
+   signal := { /* See 24.008 9.3.2 */
+   callref := call_id,
+   bearer_cap := bcap,
+   called := omit,
+   calling := omit,
+   redirecting := omit,
+   connected := omit,
+   cause := cause,
+   progress := omit,
+   useruser := omit,
+   facility := omit,
+   cccap := cccap,
+   ssversion := omit,
+   clir_sup := 0,
+   clir_inv := 0,
+   signal := omit,
+   keypad := omit,
+   more := 0,
+   notify := 0,
+   emergency := omit,
+   imsi := "",
+   lchan_type := 0,
+   lchan_mode := 0
+   }
+   }
+}
+
 
 /* MO: MSC <- MNCC: CALL_PROC.req; call