Skip to content
Snippets Groups Projects
Commit 1c35ee38 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'STF559-SEC' into Release3-onwards

parents 9ddac3a6 2be4f6eb
No related branches found
No related tags found
2 merge requests!63Merge Release4-onwards into Release4,!61Add useTls field
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Pixits.ttcn
+ 16
− 8
View file @ 1c35ee38
...@@ -173,7 +173,8 @@ module OneM2M_Pixits { ...@@ -173,7 +173,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort := 8080, // SUT CoAP/HTTP port remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3031, // Test Adapter client port (for debug purpose only) localPort := 3031, // Test Adapter client port (for debug purpose only)
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -187,7 +188,8 @@ module OneM2M_Pixits { ...@@ -187,7 +188,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort := omit, remotePort := omit,
localPort := 3041, // Test Adapter listener port (AeSimu acts as server) localPort := 3041, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -205,7 +207,8 @@ module OneM2M_Pixits { ...@@ -205,7 +207,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort := 8080, // SUT CoAP/HTTP port remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3032, // Test Adapter client port (for debug purpose only) localPort := 3032, // Test Adapter client port (for debug purpose only)
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -219,7 +222,8 @@ module OneM2M_Pixits { ...@@ -219,7 +222,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort := omit, remotePort := omit,
localPort := 3042, // Test Adapter listener port (AeSimu acts as server) localPort := 3042, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -240,7 +244,8 @@ module OneM2M_Pixits { ...@@ -240,7 +244,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort:= 8080, remotePort:= 8080,
localPort := 3131, localPort := 3131,
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -254,7 +259,8 @@ module OneM2M_Pixits { ...@@ -254,7 +259,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort:= omit, remotePort:= omit,
localPort := 3141, localPort := 3141,
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -268,7 +274,8 @@ module OneM2M_Pixits { ...@@ -268,7 +274,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort:= 8080, remotePort:= 8080,
localPort := 4131, localPort := 4131,
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
...@@ -282,7 +289,8 @@ module OneM2M_Pixits { ...@@ -282,7 +289,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1", tsAddress := "127.0.0.1",
remotePort:= omit, remotePort:= omit,
localPort := 4141, localPort := 4141,
sutAddress := "127.0.0.1" sutAddress := "127.0.0.1",
useTls := false
} }
} }
}, },
......
LibOneM2M/OneM2M_TypesAndValues.ttcn
+ 2
− 1
View file @ 1c35ee38
...@@ -4330,7 +4330,8 @@ group OtherTypes { ...@@ -4330,7 +4330,8 @@ group OtherTypes {
charstring tsAddress, charstring tsAddress,
integer remotePort optional, integer remotePort optional,
integer localPort optional, integer localPort optional,
charstring sutAddress charstring sutAddress,
boolean useTls
} }
/** /**
......
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