diff --git a/plugins/module_utils/mso.py b/plugins/module_utils/mso.py index 348ea747..05cfdab0 100644 --- a/plugins/module_utils/mso.py +++ b/plugins/module_utils/mso.py @@ -1471,10 +1471,6 @@ def input_validation(self, attr_name, attr_value, required_attributes, target_ob if attr_name in (None, "") or attr_value in (None, ""): self.module.fail_json(msg="The attribute and value must be set") - empty_attributes = [] - for attribute in required_attributes: - if target_object.get(attribute) in (None, "", [], {}, 0): - empty_attributes.append(attribute) empty_attributes = [attribute for attribute in required_attributes if target_object.get(attribute) in (None, "", [], {}, 0)] if object_position is not None and object_name is not None and empty_attributes: diff --git a/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/l4_l7_devices.yml b/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/l4_l7_devices.yml index 5c0d35af..5c325ba4 100644 --- a/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/l4_l7_devices.yml +++ b/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/l4_l7_devices.yml @@ -205,7 +205,7 @@ content: pkiTP: attributes: - certChain: "-----BEGIN CERTIFICATE-----\nMIIDdzCCAl+gAwIBAgIId3AVm9iqnt8wDQYJKoZIhvcNAQELBQAwSDELMAkGA1UE\nBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxDaXNjbyBTeXN0ZW0xFTATBgNV\nBAMTDDc0NDdEOEMxNEMyRjAeFw0yMjAzMTMwMDQ5NTFaFw00MjAzMDgwMDQ5NTFa\nMBMxETAPBgNVBAMTCHNuLWFwaWd3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEA4hISYlPylAWgYbx4i33IFDBBuOs\/9stsgFs0JdrFXdtMPbIedlxngovn\nEKgA8DPDraDZOv97a\/Zj391NMAsLv\/t9eOn8\/iFdRCvSTkRUJPdZArEkJFUj1xey\no4CmnGJHBWVYJzRD2mOtTzKZNJFKU4fuPAUqCcNi1W7MaHQ8XQCmP+ZHJbeTn4hZ\nk4WuenltTP6XED3scICZBNySjV4bKGyU\/wHlVr4bEDSQiEDlNV5PjaY4mRBbcqOV\nu2\/enzAEpfQgsOelDoNwBGxLfvHw4wDkMu1\/tPQCT\/J2zqT3kZqcfutuDXMhypr2\ncroO2eJP\/jNab1ttk+eGhY4ZLVac2wIDAQABo4GZMIGWMB0GA1UdJQQWMBQGCCsG\nAQUFBwMCBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCkGA1UdDgQiBCDI99UOK4ak\nTL6rztzjfbPL85AeIQyr1Ee4eV2i9C9dzDArBgNVHSMEJDAigCD7AaFV2Vt9mvRv\nwDEdzPGVgmvNrkhz3XFnX0M9Z3OsYTAPBgNVHREECDAGhwStJNseMA0GCSqGSIb3\nDQEBCwUAA4IBAQB4vRMUIxrkzQlKP5Av9VaxaD2qCMNp2yD6LSyx\/0Z8NQ+NrIw3\nCq+zUOYgRHgw9A5bdLQTVpI1f3ICRqdyBTUe85QuE\/gusVD1QP2y4K4m3ZqULlM1\np\/Yj01uYzeb5sqbwiLKpAOaFEF+HtXYGCCigSEoqBdyPCofeBHGGaxToWZnjvTXl\nO8R3s64xmDMCzurBufxwW5vSTaxX52czJ7RMMZAlhT9CWSGzoTLWap3gRl89D+Xu\ntWPfXo8fhx\/AVenvrdLhADJyCHnWKIw+H3XxQ6ppxIN5+Ru3ipg8fZZWZI\/neTa+\nPUv+ab+InWelTEx1hVsWhDVnVGghijGKPZs6\n-----END CERTIFICATE-----\n-----BEGIN CERTIFICATE-----\nMIIDfzCCAmegAwIBAgIIG1U4eNEM0B8wDQYJKoZIhvcNAQELBQAwSDELMAkGA1UE\nBhMCVVMxCzAJBgNVBAgTAkNBMRUwEwYDVQQKEwxDaXNjbyBTeXN0ZW0xFTATBgNV\nBAMTDDc0NDdEOEMxNEMyRjAeFw0yMjAzMTMwMDQ5NTFaFw00MjAzMDgwMDQ5NTFa\nMEgxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEChMMQ2lzY28gU3lz\ndGVtMRUwEwYDVQQDEww3NDQ3RDhDMTRDMkYwggEiMA0GCSqGSIb3DQEBAQUAA4IB\nDwAwggEKAoIBAQChjPe+oFjfnz\/iU19LXEeLNBxc6YJWPa3UH\/JHeaocTLP2dhzo\nN8DWh2iTnddWOSM1ZYyqkgEHx+c0EmPdV87ms259iq\/lJDHAhjnAJY5nXYOqN1Br\n1pMwBfWtE7\/wnLNXNFNx7JnR59joF3jMeJK8sVut1sk7bHE29oSoUF5PHL9alpTx\ni6ArySpCLa0WbLWIJrp8muQ3CeJDADjrkx+kVdDfr7rYNV0V\/GHqqbYHQn+Zw4hx\n4VxCUCDpgQZyYB6eMYoxDdEoKRMg1jvD0djQMEmH8qURe32w1Z8hEPwlKo9sfhCv\nWCkr5bBC1em1i9g9b7nhXXaYMM9hG\/mo2x1jAgMBAAGjbTBrMA4GA1UdDwEB\/wQE\nAwICpDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDwYDVR0TAQH\/BAUw\nAwEB\/zApBgNVHQ4EIgQg+wGhVdlbfZr0b8AxHczxlYJrza5Ic91xZ19DPWdzrGEw\nDQYJKoZIhvcNAQELBQADggEBAIjCk5ppRpN9+WqBCRyoOLy6U6umEbyqxfWQnELU\nSviW8Cxstgpe65S66myWpuRSBk+EPHugwLT4nRGWWmzLIMU5SKwuCKXq97ifcVoM\npXMgwS8PVkX3fJwJ5Ipag+F+tljhlXoe5ZJuckdzLiC0gwXPBZq745hGqs3cJDnr\nQUxskUfscVb2wLOQfNDiQlO2d1iYtXRk8adN0WGXcEzSj8Wh2eWFx\/9QLwCfCf35\nABo9iTfzc7fcaGRAC4YbZXhE1Gw+WVm3T+DZ5Mjs6w3r0WjXe4NZfK\/C9Db3u2oe\nrfJj4xNFu3FeVGSOYRdLV4bQnPHGNswNDxZm5gqcrpsF71o=\n-----END CERTIFICATE-----" + certChain: '{{ lookup("file", "pki/admin.crt") }}' name: '{{ mso_tenant | default("ansible_test") }}_ca' - name: Add key ring to the {{ mso_tenant | default("ansible_test") }} tenant diff --git a/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/pki/admin.crt b/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/pki/admin.crt new file mode 100644 index 00000000..1f797a4c --- /dev/null +++ b/tests/integration/targets/mso_schema_site_contract_service_graph_listener/tasks/pki/admin.crt @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICODCCAaGgAwIBAgIJAIt8XMntue0VMA0GCSqGSIb3DQEBCwUAMDQxDjAMBgNV +BAMMBUFkbWluMRUwEwYDVQQKDAxZb3VyIENvbXBhbnkxCzAJBgNVBAYTAlVTMCAX +DTE4MDEwOTAwNTk0NFoYDzIxMTcxMjE2MDA1OTQ0WjA0MQ4wDAYDVQQDDAVBZG1p +bjEVMBMGA1UECgwMWW91ciBDb21wYW55MQswCQYDVQQGEwJVUzCBnzANBgkqhkiG +9w0BAQEFAAOBjQAwgYkCgYEAohG/7axtt7CbSaMP7r+2mhTKbNgh0Ww36C7Ta14i +v+VmLyKkQHnXinKGhp6uy3Nug+15a+eIu7CrgpBVMQeCiWfsnwRocKcQJWIYDrWl +XHxGQn31yYKR6mylE7Dcj3rMFybnyhezr5D8GcP85YRPmwG9H2hO/0Y1FUnWu9Iw +AQkCAwEAAaNQME4wHQYDVR0OBBYEFD0jLXfpkrU/ChzRvfruRs/fy1VXMB8GA1Ud +IwQYMBaAFD0jLXfpkrU/ChzRvfruRs/fy1VXMAwGA1UdEwQFMAMBAf8wDQYJKoZI +hvcNAQELBQADgYEAOmvre+5tgZ0+F3DgsfxNQqLTrGiBgGCIymPkP/cBXXkNuJyl +3ac7tArHQc7WEA4U2R2rZbEq8FC3UJJm4nUVtCPvEh3G9OhN2xwYev79yt6pIn/l +KU0Td2OpVyo0eLqjoX5u2G90IBWzhyjFbo+CcKMrSVKj1YOdG0E3OuiJf00= +-----END CERTIFICATE----- \ No newline at end of file