Skip to content

Commit

Permalink
Update schema_test.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@droideck
droideck committed Aug 30, 2024
1 parent 53f79de commit 4f461e3
Showing 1 changed file with 64 additions and 91 deletions.
155 changes: 64 additions & 91 deletions dirsrvtests/tests/suites/clu/schema_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,36 @@
pytestmark = pytest.mark.tier0
log = logging.getLogger(__name__)

@pytest.fixture(scope="function")
def create_attribute(request, topo):
schema = Schema(topo.standalone)
attr_name = request.param['name']
oid = request.param['oid']
desc = request.param.get('desc', 'Test attribute')
syntax = request.param.get('syntax', '1.3.6.1.4.1.1466.115.121.1.15')
x_origin = request.param.get('x_origin', None)
sup = request.param.get('sup', None)

parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': (attr_name,),
'oid': oid,
'desc': desc,
'syntax': syntax,
})
if x_origin:
parameters['x_origin'] = x_origin
if sup:
parameters['sup'] = sup

schema.add_attributetype(parameters)

def fin():
schema.remove_attributetype(attr_name)

request.addfinalizer(fin)
return attr_name, schema


def test_origins_with_extra_parenthesis(topo):
"""Test the custom schema with extra parenthesis in X-ORIGIN can be parsed
Expand Down Expand Up @@ -52,15 +82,18 @@ def test_origins_with_extra_parenthesis(topo):
# Verify the x-origin value is correct
assert attr_result['at']['x_origin'][0] == X_ORG_VAL

# Clean up
schema.remove_attributetype(ATTR_NAME)

schema_params = [
['attr1', '99999.1', None],
['attr2', '99999.2', 'test-str'],
['attr3', '99999.3', ['test-list']],
['attr4', '99999.4', ('test-tuple')],
{'name': 'attr1', 'oid': '99999.1', 'x_origin': None},
{'name': 'attr2', 'oid': '99999.2', 'x_origin': 'test-str'},
{'name': 'attr3', 'oid': '99999.3', 'x_origin': ['test-list']},
{'name': 'attr4', 'oid': '99999.4', 'x_origin': ('test-tuple',)},
]
@pytest.mark.parametrize("name, oid, xorg", schema_params)
def test_origins(topo, name, oid, xorg):

@pytest.mark.parametrize("create_attribute", schema_params, indirect=True)
def test_origins(create_attribute):
"""Test the various possibilities of x-origin
:id: 3229f6f8-67c1-4558-9be5-71434283086a
Expand All @@ -70,22 +103,12 @@ def test_origins(topo, name, oid, xorg):
:expectedresults:
1. Success
"""
attr_name, schema = create_attribute
attr_result = schema.query_attributetype(attr_name, json=True)
assert attr_result['at']['names'][0] == attr_name

schema = Schema(topo.standalone)

# Add new attribute
parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': (name,),
'oid': oid,
'desc': 'Test X-ORIGIN',
'syntax': '1.3.6.1.4.1.1466.115.121.1.15',
'x_origin': xorg,
})
schema.add_attributetype(parameters)


def test_mrs(topo):
@pytest.mark.parametrize("create_attribute", [{'name': 'test-mr', 'oid': '99999999', 'desc': 'Test matching rule'}], indirect=True)
def test_mrs(create_attribute):
"""Test an attribute can be added with a matching rule
:id: e4eb06e0-7f80-41fe-8868-08c2bafc7590
Expand All @@ -95,21 +118,12 @@ def test_mrs(topo):
:expectedresults:
1. Success
"""
schema = Schema(topo.standalone)

# Add new attribute
parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': ('test-mr',),
'oid': '99999999',
'desc': 'Test matching rule',
'syntax': '1.3.6.1.4.1.1466.115.121.1.15',
'substr': 'numericstringsubstringsmatch',
})
schema.add_attributetype(parameters)
attr_name, schema = create_attribute
parameters = {'substr': 'numericstringsubstringsmatch'}
schema.edit_attributetype(attr_name, parameters)


def test_edit_attributetype(topo):
@pytest.mark.parametrize("create_attribute", [{'name': 'testEditAttr', 'oid': '1.2.3.4.5.6.7.8888', 'desc': 'Test edit attribute type'}], indirect=True)
def test_edit_attributetype(create_attribute):
"""Test editing an attribute type in the schema
:id: 07c98f6a-89f8-44e5-9cc1-353d1f7bccf4
Expand All @@ -123,34 +137,20 @@ def test_edit_attributetype(topo):
2. Success
3. Changes are reflected correctly
"""

schema = Schema(topo.standalone)

# Add new attribute type
attr_name = 'testEditAttr'
parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': (attr_name,),
'oid': '1.2.3.4.5.6.7.8888',
'desc': 'Test edit attribute type',
'syntax': '1.3.6.1.4.1.1466.115.121.1.15',
})
schema.add_attributetype(parameters)
attr_name, schema = create_attribute

# Edit the attribute type
edit_parameters = {
'desc': 'Updated description for test edit attribute type',
'syntax': '1.3.6.1.4.1.1466.115.121.1.26', # IA5String
}
schema.edit_attributetype(attr_name, edit_parameters)

# Verify the changes
edited_attr = schema.query_attributetype(attr_name, json=True)
assert edited_attr['at']['desc'][0] == 'Updated description for test edit attribute type'
assert edited_attr['at']['syntax'][0] == '1.3.6.1.4.1.1466.115.121.1.26'

# Clean up
schema.remove_attributetype(attr_name)


def test_edit_objectclass(topo):
"""Test editing an object class in the schema
Expand Down Expand Up @@ -199,7 +199,8 @@ def test_edit_objectclass(topo):
schema.remove_objectclass(oc_name)


def test_edit_attributetype_remove_superior(topo):
@pytest.mark.parametrize("create_attribute", [{'name': 'testEditAttrSup', 'oid': '1.2.3.4.5.6.7.7777', 'desc': 'Test edit attribute type with superior', 'sup': ('name',)}], indirect=True)
def test_edit_attributetype_remove_superior(create_attribute):
"""Test editing an attribute type to remove a parameter from it
:id: bd6ae89f-9617-4620-adc2-465884ca568b
Expand All @@ -213,20 +214,11 @@ def test_edit_attributetype_remove_superior(topo):
2. Success
3. Superior is removed and inherited matching rules are cleared
"""
attr_name, schema = create_attribute

schema = Schema(topo.standalone)

# Add new attribute type with a superior
attr_name = 'testEditAttrSup'
parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': (attr_name,),
'oid': '1.2.3.4.5.6.7.7777',
'desc': 'Test edit attribute type with superior',
'syntax': '1.3.6.1.4.1.1466.115.121.1.15', # DirectoryString
'sup': ('name',),
})
schema.add_attributetype(parameters)
# Verify the attribute was created with a superior
initial_attr = schema.query_attributetype(attr_name, json=True)
assert 'sup' in initial_attr['at'] and initial_attr['at']['sup'][0] == 'name', "Superior not set correctly"

# Edit the attribute type to remove the superior
edit_parameters = {
Expand All @@ -236,16 +228,14 @@ def test_edit_attributetype_remove_superior(topo):

# Verify the changes
edited_attr = schema.query_attributetype(attr_name, json=True)
assert 'sup' not in edited_attr['at'] or not edited_attr['at']['sup']
assert 'equality' not in edited_attr['at'] or not edited_attr['at']['equality']
assert 'ordering' not in edited_attr['at'] or not edited_attr['at']['ordering']
assert 'substr' not in edited_attr['at'] or not edited_attr['at']['substr']

# Clean up
schema.remove_attributetype(attr_name)
assert 'sup' not in edited_attr['at'] or not edited_attr['at']['sup'], "Superior not removed"
assert 'equality' not in edited_attr['at'] or not edited_attr['at']['equality'], "Equality matching rule not cleared"
assert 'ordering' not in edited_attr['at'] or not edited_attr['at']['ordering'], "Ordering matching rule not cleared"
assert 'substr' not in edited_attr['at'] or not edited_attr['at']['substr'], "Substring matching rule not cleared"


def test_edit_attribute_keep_custom_values(topo):
@pytest.mark.parametrize("create_attribute", [{'name': 'testCustomAttr', 'oid': '1.2.3.4.5.6.7.8888', 'desc': 'Initial description for custom attribute'}], indirect=True)
def test_edit_attribute_keep_custom_values(create_attribute):
"""Test editing a custom schema attribute keeps all custom values
:id: 5b1e2e8b-28c2-4f77-9c03-07eff20f763d
Expand All @@ -263,22 +253,9 @@ def test_edit_attribute_keep_custom_values(topo):
4. Success
5. Both custom description and OID are preserved
"""

schema = Schema(topo.standalone)

# Create a custom attribute
attr_name = 'testCustomAttr'
attr_name, schema = create_attribute
initial_oid = '1.2.3.4.5.6.7.8888'
initial_desc = 'Initial description for custom attribute'

parameters = OBJECT_MODEL_PARAMS[AttributeType].copy()
parameters.update({
'names': (attr_name,),
'oid': initial_oid,
'desc': initial_desc,
'syntax': '1.3.6.1.4.1.1466.115.121.1.15', # DirectoryString
})
schema.add_attributetype(parameters)

# Verify the attribute was created correctly
attr = schema.query_attributetype(attr_name, json=True)
Expand Down Expand Up @@ -312,10 +289,6 @@ def test_edit_attribute_keep_custom_values(topo):
# Additional check: Ensure the attribute name wasn't used as the OID
assert re_edited_attr['at']['oid'][0] != f"{attr_name}-oid", "OID was incorrectly set to '<ATTRIBUTE_NAME>-oid'"

# Clean up
schema.remove_attributetype(attr_name)


if __name__ == '__main__':
# Run isolated
# -s for DEBUG mode
Expand Down

0 comments on commit 4f461e3

Please sign in to comment.