Skip to content

Commit fb3ce08

Browse files
authored
Merge pull request #13 from openBackhaul:openBackhaul/issue4
Connection between Application and Controller
2 parents 0999fac + 705eeb1 commit fb3ce08

23 files changed

+501
-80
lines changed

spec/ControllerDomainManager+services.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ servers:
219219
uuid:
220220
- operation-name: /p1/measure-list-of-forwardings
221221
uuid:
222+
- operation-name: /p1/measure-controller
223+
uuid:
222224
- operation-name: /p1/measure-list-of-mount-points
223225
uuid:
224226
- operation-name: /p1/measure-links
@@ -259,6 +261,8 @@ servers:
259261
uuid:
260262
- operation-name: /p1/reconstruct-forwarding
261263
uuid:
264+
- operation-name: /p1/reconstruct-controller
265+
uuid:
262266
- operation-name: /p1/construct-mount-point
263267
uuid:
264268
- operation-name: /p1/destruct-mount-point

spec/Elements/ADM/adm.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,17 @@ paths:
6262
remote-port:
6363
type: integer
6464
description: 'Remote TCP port at the TcpClient of the LTP identified by the managementDomain from OperationalDS'
65+
http-user-name:
66+
type: string
67+
description: 'Username applied by the HttpClient of the LTP identified by the managementDomain from OperationalDS'
68+
http-password:
69+
type: integer
70+
description: 'Password applied by the HttpClient of the LTP identified by the managementDomain from OperationalDS'
6571
example:
6672
remote-ip-address: '127.0.0.1'
6773
remote-port: 4711
74+
http-user-name: 'MicroWaveDeviceInventory'
75+
http-password: 'geheim123'
6876
headers:
6977
x-correlator:
7078
schema:
@@ -158,11 +166,23 @@ paths:
158166
description: >
159167
'New value of the remote TCP port at the TcpClient of the LTP identified by the managementDomain
160168
from [CDM://p1/reconstruct-management-domain-interface$request.body#remote-port]'
169+
http-user-name:
170+
type: string
171+
description: >
172+
'New value of the username to be applied by the HttpClient of the LTP identified by the managementDomain
173+
from [CDM://p1/reconstruct-management-domain-interface$request.body#http-user-name]'
174+
http-password:
175+
type: integer
176+
description: >
177+
'New value of the password to be applied by the HttpClient of the LTP identified by the managementDomain
178+
from [CDM://p1/reconstruct-management-domain-interface$request.body#http-password]'
161179
example:
162180
application-name: 'MicroWaveDeviceInventory'
163181
management-domain-name: 'live'
164182
remote-ip-address: '127.0.0.1'
165183
remote-port: 4712
184+
http-user-name: 'MicroWaveDeviceInventory'
185+
http-password: 'geheim123'
166186
responses:
167187
'204':
168188
description: 'ManagementDomainInterface updated'

spec/Elements/OpenDaylight/OpenDaylight.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,30 @@ The OpenDaylight Controller is an open source controller [project](https://www.o
55

66
### MeasurementFunctions
77

8+
- /p1/measure-controller
9+
get ???
10+
11+
.
12+
13+
Request for reading user credentials from OpenDaylight to be added here and in the excerpt of its proprietary API
14+
15+
.
16+
817
- /p1/measure-list-of-mount-points
918
get /rests/data/network-topology:network-topology/topology=topology-netconf?fields=node
1019

1120

1221
### ImplementationFunctions
1322

23+
- /p1/reconstruct-controller
24+
put ???
25+
26+
.
27+
28+
Requests for updating the user credentials in OpenDaylight to be added here and in the excerpt of its proprietary API
29+
30+
.
31+
1432
- /p1/construct-mount-point
1533
post /rests/data/network-topology:network-topology/topology=topology-netconf
1634

spec/Functions/Implementation/ImplementationFunctions.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Managed Elements and associated ImplementationFunctions:
1515
- Update Forwarding
1616
- /p1/reconstruct-forwarding
1717
- [Controller and MountPoint](#controller-and-mountpoint)
18+
- Update Controller
19+
- /p1/reconstruct-controller
1820
- Create MountPoint
1921
- /p1/construct-mount-point
2022
- Delete MountPoint
@@ -51,6 +53,7 @@ Is addressing the [ApplicationDomainManager](https://github.com/openBackhaul/App
5153

5254
#### Made Configurations:
5355
- The Application's TcpClient is adjusted with the TCP/IP address of either LoadBalancer or Controller
56+
- The Application's HttpClient is adjusted with the user credentials at the Controllers
5457

5558
#### Inverse Interpretations:
5659
Callback$request.body#remote-ip-address:
@@ -59,6 +62,12 @@ Callback$request.body#remote-ip-address:
5962
request.body#remote-port:
6063
- From [remote-port] at LP identified by 'tcp-client' inside LTP identified by [management-domain] inside ControlConstruct identified by [application-name] in RunningDS
6164

65+
request.body#http-user-name:
66+
- From [http-user-name] at LP identified by 'http-client' inside LTP identified by [management-domain] inside ControlConstruct identified by [application-name] in RunningDS
67+
68+
request.body#http-password:
69+
- From [http-password] at LP identified by 'http-client' inside LTP identified by [management-domain] inside ControlConstruct identified by [application-name] in RunningDS
70+
6271
#### Feedback into CurrentAlarms:
6372
- date-of-attempt
6473
- response-code
@@ -194,6 +203,34 @@ If the Callback would return local-ip-address and local-port of the newly create
194203
The CDM encapsulates the Controller.
195204
It manages the entire logical resource of the Controller, which is the MountPoints.
196205

206+
### /p1/reconstruct-controller
207+
208+
Is addressing the OpenDaylight controller
209+
210+
#### Input:
211+
- controller-name
212+
Name of the Controller that shall be updated
213+
214+
#### Callback:
215+
- [ODL://rests/???](../../Elements/OpenDaylight/OpenDaylight.yaml)
216+
217+
#### Made Configurations:
218+
- User credentials are updated
219+
220+
#### Inverse Interpretations:
221+
- Callback$???:
222+
- From [http-user-name] at LP[*] inside LTP identified by 'controller-manager' inside ControlConstruct identified by [controller-name] in RunningDS
223+
- Callback$???:
224+
- From [http-password] at LP[*] inside LTP identified by 'controller-manager' inside ControlConstruct identified by [controller-name] in RunningDS
225+
226+
#### Feedback into CurrentAlarms:
227+
- date-of-attempt
228+
- response-code
229+
- date-of-next-attempt-to-fix
230+
231+
#### Output:
232+
./.
233+
197234
### /p1/construct-mount-point
198235

199236
Is addressing the OpenDaylight controller
@@ -325,3 +362,4 @@ Is addressing the OpenDaylight controller
325362

326363
#### Output:
327364
./.
365+

0 commit comments

Comments
 (0)