Commit 6edaa115 authored by rennoch's avatar rennoch

updates due to LibSipV2 types modifications

parent d86480c1
......@@ -225,10 +225,14 @@ group EMERGENCY{
/** @desc charstring for identity of the emergency service
*/
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE := "service:sos";
/** @desc charstring for identity of the invalid emergency service
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_namespaceId := "service";
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_namespaceSpecificString := "sos";
/** @desc charstring for identity of the invalid emergency service
*/
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID := "service:sos.invalid";
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID_namespaceId := "service";
modulepar charstring PX_IMS_SUT_EMERGENCY_SERVICE_INVALID_namespaceSpecificString := "sos.invalid";
}// end group EMERGENCY service
group SUT_IBCF {
......
......@@ -18,7 +18,7 @@ const integer c_ISUP_HOP_COUNT:=31; //TODO replace this value with appropriate P
// URN scheme (RFC 5031)
// TODO NOTE: this definition is for temporary use
const charstring c_urnScheme := "urn";
// const charstring c_urnScheme := "urn"; // defined in LibSIPTyypesAndValues
group UserProfileConstants
{
......
This diff is collapsed.
......@@ -19,6 +19,7 @@ module LibIms_Templates
import from LibSip_Steps all;
import from LibSip_PIXITS all;
import from LibSip_XMLTypes all;
import from LibSip_MessageBodyTypes all;
//LibIms
import from LibIms_SIPTypesAndValues all;
......@@ -83,8 +84,9 @@ module LibIms_Templates
displayName := *,
addrSpec := {
scheme := "sip:",
userInfo := *,
hostPort := {p_host, p_port},
components := { sip:= {
userInfo := *,
hostPort := {p_host, p_port}}},
urlParameters := *,
headers := *
}
......@@ -97,13 +99,14 @@ group Subfields{
template SipUrl m_SipUrl_currIpaddr_CSCF(in SipUserProfile p_userprofile) := //* SIP-URL of the test system on SIP side
{
scheme := c_sipScheme, //* contains "sip"
scheme := c_sipScheme, //* contains "sip"
components := { sip:= {
userInfo := omit, //* optional
hostPort :=
{
host := p_userprofile.currIpaddr, //* hostname, IPv4 or IPv6 as a charstring
portField := p_userprofile.currPort //* optional integer
},
{
host := p_userprofile.currIpaddr, //* hostname, IPv4 or IPv6 as a charstring
portField := p_userprofile.currPort //* optional integer
}}},
urlParameters := omit,
headers := omit
}
......@@ -158,13 +161,14 @@ group HeaderFieldTemplates{
displayName := omit, // optional charstring
addrSpec := {
scheme := c_sipScheme,
userInfo := {
userOrTelephoneSubscriber := "registrar",
password := omit
},
hostPort := {
PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
},
components := { sip:= {
userInfo := {
userOrTelephoneSubscriber := "registrar",
password := omit
},
hostPort := {
PX_IMS_TS_PCSCF_HOME_DOMAIN, PX_IMS_TS_PCSCF_PORT
}}},
urlParameters := { { id := "lr", paramValue := omit}},
headers := omit
}
......@@ -288,12 +292,13 @@ group HeaderFieldTemplates{
addrSpec :=
{
scheme := c_sipScheme, // contains "sip"
userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
hostPort :=
{
host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
portField := omit
},
components := { sip:= {
userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
hostPort :=
{
host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
portField := omit
}}},
urlParameters := omit,
headers := omit
}
......@@ -319,10 +324,11 @@ group HeaderFieldTemplates{
fieldName := ROUTE_E,
routeBody := {{nameAddr := {displayName := omit,
addrSpec := {scheme := c_sipScheme, // contains "sip"
components := { sip:= {
userInfo := omit,
hostPort := {host:=p_interfaceprofile.SUTHomeDomain, portField:= omit},
urlParameters := omit,
headers := omit}
hostPort := {host:=p_interfaceprofile.SUTHomeDomain, portField:= omit}}},
urlParameters := omit,
headers := omit}
},
rrParam := omit}
}};
......@@ -338,12 +344,13 @@ group HeaderFieldTemplates{
addrSpec :=
{
scheme := c_sipScheme, // contains "sip"
userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
hostPort :=
{
host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
portField := omit
},
components := { sip:= {
userInfo := {userOrTelephoneSubscriber := "unknown", password := omit},
hostPort :=
{
host := "unknown.domain.name", // hostname, IPv4 or IPv6 as a charstring
portField := omit
}}},
urlParameters := omit,
headers := omit
}
......@@ -1119,8 +1126,8 @@ group ResourceListsTemplates {
template EntryType m_EntryUser(SipUrl p_user) := {
uri :=
p_user.userInfo.userOrTelephoneSubscriber & "@" &
p_user.hostPort.host,
p_user.components.sip.userInfo.userOrTelephoneSubscriber & "@" &
p_user.components.sip.hostPort.host,
attr := {},
display_name := omit,
elem_list := {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment