Skip to content

Commit 2777be8

Browse files
caspervkcaspervk
committed
fix: [#59851] use mo2ldap in dev-environment/kolding_fixture.yaml
This was probably forgotten in c239729.
1 parent 94cc4d2 commit 2777be8

File tree

2 files changed

+59
-62
lines changed

2 files changed

+59
-62
lines changed

‎dev-environment/kolding_fixture.yaml

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ ldap_to_mo:
2525
user_key: '{{ ldap.entryUUID }}'
2626
itsystem: '{{ get_it_system_uuid(''ADUUID'') }}'
2727
person: '{{ employee_uuid or NONE }}'
28-
mo_to_ldap:
29-
Employee:
30-
employeeNumber: '{{mo_employee.cpr_number}}'
31-
title: '{{ mo_employee.user_key }}'
32-
givenName: '{{ mo_employee.given_name }}'
33-
sn: '{{ mo_employee.surname }}'
34-
ADtitle:
35-
title: '{{ mo_employee_it_user.user_key }}'
36-
employeeNumber: '{{ mo_employee.cpr_number }}'
37-
ADUUID:
38-
title: '{{ NONE }}'
39-
entryUUID: '{{ mo_employee_it_user.user_key }}'
40-
employeeNumber: '{{ mo_employee.cpr_number }}'
28+
mo2ldap: |
29+
{% set mo_employee = load_mo_employee(uuid, current_objects_only=False) %}
30+
{% set mo_employee_it_user = load_mo_it_user(uuid, "ADUUID") %}
31+
32+
{{
33+
{
34+
"employeeNumber": mo_employee.cpr_number,
35+
"title": mo_employee.user_key,
36+
"givenName": mo_employee.given_name,
37+
"sn": mo_employee.surname,
38+
"entryUUID": mo_employee_it_user.user_key,
39+
}|tojson
40+
}}
4141
username_generator:
4242
objectClass: UserNameGenerator
4343
combinations_to_try: ["FFFX", "LLLX"]

‎docker-compose.yml

+46-49
Original file line numberDiff line numberDiff line change
@@ -87,58 +87,55 @@ services:
8787
# !!!!!!!!!!!!!!!!!!!! DO NOT EDIT BY HAND !!!!!!!!!!!!!!!!!!!!
8888
CONVERSION_MAPPING: >-
8989
{
90-
"ldap_to_mo": {
91-
"Employee": {
92-
"objectClass": "ramodels.mo.employee.Employee",
93-
"_import_to_mo_": "false",
94-
"_ldap_attributes_": ["employeeNumber", "title", "givenName", "sn"],
95-
"uuid": "{{ employee_uuid or NONE }}",
96-
"nickname_given_name": "{{ get_employee_dict(employee_uuid).nickname_given_name }}",
97-
"nickname_surname": "{{ get_employee_dict(employee_uuid).nickname_surname }}",
98-
"cpr_number": "{{ldap.employeeNumber|strip_non_digits or NONE}}",
99-
"user_key": "{{ ldap.title }}",
100-
"given_name": "{{ ldap.givenName }}",
101-
"surname": "{{ ldap.sn }}"
102-
},
103-
"ADtitle": {
104-
"objectClass": "ramodels.mo.details.it_system.ITUser",
105-
"_import_to_mo_": "true",
106-
"_ldap_attributes_": ["title"],
107-
"user_key": "{{ ldap.title }}",
108-
"itsystem": "{{ get_it_system_uuid('ADtitle') }}",
109-
"person": "{{ employee_uuid or NONE }}"
110-
},
111-
"ADUUID": {
112-
"objectClass": "ramodels.mo.details.it_system.ITUser",
113-
"_import_to_mo_": "true",
114-
"_ldap_attributes_": ["title", "entryUUID"],
115-
"_terminate_": "{{ now()|mo_datestring if ldap.title == \"WOW\" else NONE }}",
116-
"user_key": "{{ ldap.entryUUID }}",
117-
"itsystem": "{{ get_it_system_uuid('ADUUID') }}",
118-
"person": "{{ employee_uuid or NONE }}"
119-
}
90+
"ldap_to_mo": {
91+
"Employee": {
92+
"objectClass": "ramodels.mo.employee.Employee",
93+
"_import_to_mo_": "false",
94+
"_ldap_attributes_": [
95+
"employeeNumber",
96+
"title",
97+
"givenName",
98+
"sn"
99+
],
100+
"uuid": "{{ employee_uuid or NONE }}",
101+
"nickname_given_name": "{{ get_employee_dict(employee_uuid).nickname_given_name }}",
102+
"nickname_surname": "{{ get_employee_dict(employee_uuid).nickname_surname }}",
103+
"cpr_number": "{{ldap.employeeNumber|strip_non_digits or NONE}}",
104+
"user_key": "{{ ldap.title }}",
105+
"given_name": "{{ ldap.givenName }}",
106+
"surname": "{{ ldap.sn }}"
120107
},
121-
"mo_to_ldap": {
122-
"Employee": {
123-
"employeeNumber": "{{mo_employee.cpr_number}}",
124-
"title": "{{ mo_employee.user_key }}",
125-
"givenName": "{{ mo_employee.given_name }}",
126-
"sn": "{{ mo_employee.surname }}"
127-
},
128-
"ADtitle": {
129-
"title": "{{ mo_employee_it_user.user_key }}",
130-
"employeeNumber": "{{ mo_employee.cpr_number }}"
131-
},
132-
"ADUUID": {
133-
"title": "{{ NONE }}",
134-
"entryUUID": "{{ mo_employee_it_user.user_key }}",
135-
"employeeNumber": "{{ mo_employee.cpr_number }}"
136-
}
108+
"ADtitle": {
109+
"objectClass": "ramodels.mo.details.it_system.ITUser",
110+
"_import_to_mo_": "true",
111+
"_ldap_attributes_": [
112+
"title"
113+
],
114+
"user_key": "{{ ldap.title }}",
115+
"itsystem": "{{ get_it_system_uuid('ADtitle') }}",
116+
"person": "{{ employee_uuid or NONE }}"
137117
},
138-
"username_generator": {
139-
"objectClass": "UserNameGenerator",
140-
"combinations_to_try": ["FFFX", "LLLX"]
118+
"ADUUID": {
119+
"objectClass": "ramodels.mo.details.it_system.ITUser",
120+
"_import_to_mo_": "true",
121+
"_ldap_attributes_": [
122+
"title",
123+
"entryUUID"
124+
],
125+
"_terminate_": "{{ now()|mo_datestring if ldap.title == \"WOW\" else NONE }}",
126+
"user_key": "{{ ldap.entryUUID }}",
127+
"itsystem": "{{ get_it_system_uuid('ADUUID') }}",
128+
"person": "{{ employee_uuid or NONE }}"
141129
}
130+
},
131+
"mo2ldap": "{% set mo_employee = load_mo_employee(uuid, current_objects_only=False) %}\n{% set mo_employee_it_user = load_mo_it_user(uuid, \"ADUUID\") %}\n\n{{\n {\n \"employeeNumber\": mo_employee.cpr_number,\n \"title\": mo_employee.user_key,\n \"givenName\": mo_employee.given_name,\n \"sn\": mo_employee.surname,\n \"entryUUID\": mo_employee_it_user.user_key,\n }|tojson\n}}\n",
132+
"username_generator": {
133+
"objectClass": "UserNameGenerator",
134+
"combinations_to_try": [
135+
"FFFX",
136+
"LLLX"
137+
]
138+
}
142139
}
143140
144141
volumes:

0 commit comments

Comments
 (0)