diff --git a/4.2/es/tmp.generic_cidr.js b/4.2/es/tmp.cidr_generator.js similarity index 95% rename from 4.2/es/tmp.generic_cidr.js rename to 4.2/es/tmp.cidr_generator.js index a586b098c4a2f94cff82d9ac2a996350ab025032..d5b7b7a88daaf776344f33679f49a9af22fd2062 100644 --- a/4.2/es/tmp.generic_cidr.js +++ b/4.2/es/tmp.cidr_generator.js @@ -18,7 +18,7 @@ export default { const cnf = {} Object.assign(cnf, (config || {}).netdb_axios_config) cnf.params = params - return Axios.get(`${NETVSConfig.NETDB_API_BASE_URL}/${NETVSConfig.NETDB_API_VERSION}/tmp/generic_cidr/list`, cnf) + return Axios.get(`${NETVSConfig.NETDB_API_BASE_URL}/${NETVSConfig.NETDB_API_VERSION}/tmp/cidr_generator/list`, cnf) // eslint-disable-next-line comma-dangle }, } diff --git a/4.2/functions.json b/4.2/functions.json index 14a8e4376f44705a004f9edeac50d0137c7497fa..be39b920237b453283e6111dd19e22c3080912ff 100644 --- a/4.2/functions.json +++ b/4.2/functions.json @@ -18925,7 +18925,7 @@ { "name": "list", "system": "tmp", - "fq_name": "tmp.generic_cidr.list", + "fq_name": "tmp.cidr_generator.list", "parameters": { "value_limit": { "old": { @@ -18985,7 +18985,7 @@ "is_deprecated": false } }, - "object_type": "generic_cidr", + "object_type": "cidr_generator", "is_returning": true, "is_executable": true, "is_data_manipulating": false diff --git a/4.2/golang/structs.go b/4.2/golang/structs.go index 6c7bf484dc5ff69a049c05031fb3d2b6d9c0dc6a..08f3033e43ca406f353362ca015c7600146004da 100644 --- a/4.2/golang/structs.go +++ b/4.2/golang/structs.go @@ -1364,7 +1364,7 @@ type DnsFqdnStatistic struct { SubFqdnCount int64 `mapstructure:"sub_fqdn_count"` } -type TmpGenericCidr struct { +type TmpCidrGenerator struct { Value net.IPNet `mapstructure:"value"` BaseValue net.IPNet `mapstructure:"base_value"` } diff --git a/4.2/objects.json b/4.2/objects.json index e87743649b424d0c3879bd996f4227d0859cd707..efea49cf3d66b9e8d04670db6fa9641cbea57f84 100644 --- a/4.2/objects.json +++ b/4.2/objects.json @@ -1169,6 +1169,36 @@ "do_activate_global_pk2obj": true, "object_type_grants_read_access": true }, + { + "name": "cidr_generator", + "system": "tmp", + "fq_name": "tmp.cidr_generator", + "attributes": { + "value": { + "is_core": true, + "data_type": "ip_network", + "is_nullable": false, + "is_deprecated": false + }, + "base_value": { + "is_core": true, + "data_type": "ip_network", + "is_nullable": false, + "is_deprecated": false + } + }, + "is_log_dst": false, + "is_log_src": false, + "constraints": {}, + "is_lang_dst": false, + "is_lang_src": false, + "referencing": {}, + "is_otattr_dst": false, + "is_otattr_src": false, + "referenceable": {}, + "do_activate_global_pk2obj": false, + "object_type_grants_read_access": true + }, { "name": "client", "system": "macauth", @@ -6417,36 +6447,6 @@ "do_activate_global_pk2obj": false, "object_type_grants_read_access": true }, - { - "name": "generic_cidr", - "system": "tmp", - "fq_name": "tmp.generic_cidr", - "attributes": { - "value": { - "is_core": true, - "data_type": "ip_network", - "is_nullable": false, - "is_deprecated": false - }, - "base_value": { - "is_core": true, - "data_type": "ip_network", - "is_nullable": false, - "is_deprecated": false - } - }, - "is_log_dst": false, - "is_log_src": false, - "constraints": {}, - "is_lang_dst": false, - "is_lang_src": false, - "referencing": {}, - "is_otattr_dst": false, - "is_otattr_src": false, - "referenceable": {}, - "do_activate_global_pk2obj": false, - "object_type_grants_read_access": true - }, { "name": "generic_object", "system": "tmp", diff --git a/4.2/openapi.yml b/4.2/openapi.yml index 5dea5e8b0608fd91889abb57ab50952a92836013..877d05577d927048fcc44529fab3a567c1b28a75 100644 --- a/4.2/openapi.yml +++ b/4.2/openapi.yml @@ -3726,6 +3726,16 @@ components: description: Kurzbezeichnung des OE-Typs type: string type: object + tmp.cidr_generator: + description: '' + properties: + base_value: + description: "Zugeh\xF6riger Basiswert des generierten CIDR-Objektes" + type: string + value: + description: CIDR-Notation des generierten CIDR-Objektes + type: string + type: object tmp.diag4gpk: description: '' properties: @@ -3740,16 +3750,6 @@ components: description: WebAPI-Systemname type: string type: object - tmp.generic_cidr: - description: '' - properties: - base_value: - description: "Zugeh\xF6riger Basiswert des generierten CIDR-Objektes" - type: string - value: - description: CIDR-Notation des generierten CIDR-Objektes - type: string - type: object tmp.generic_object: description: '' properties: @@ -4084,7 +4084,7 @@ info: \ nicht Bestandteil dieser Dokumentation, sondern \xFCber selbstdokumentierende\ \ Indexabfragen der WebAPI erreichbar." title: SCC NETDB-API - version: 4.2.3 + version: 4.2.27 openapi: 3.0.3 paths: /cntl/column/create: @@ -32392,46 +32392,7 @@ paths: - api_key: [] tags: - org - /tmp/diag4gpk/list: - get: - parameters: - - description: WebAPI-Systemname - in: query - name: system_name - required: false - schema: - nullable: false - type: string - - description: Name, unter dem die Tabelle incl. deren als WebAPI-Attribut gekennzeichneten - Spalten als Web-API-Objekttyp angesprochen werden kann. - in: query - name: object_type_name - required: false - schema: - nullable: false - type: string - responses: - 200: - content: - application/json: - schema: - items: - items: - $ref: '#/components/schemas/tmp.diag4gpk' - type: array - type: array - description: Request erfolgreich - 400: - description: Eingabefehler - 401: - description: Unautorisiert - 500: - description: Interner Serverfehler - security: - - api_key: [] - tags: - - tmp - /tmp/generic_cidr/list: + /tmp/cidr_generator/list: get: parameters: - description: "Maximale Anzahl der generierten CIDR-Objekte je Basiswert, die\ @@ -32514,7 +32475,46 @@ paths: schema: items: items: - $ref: '#/components/schemas/tmp.generic_cidr' + $ref: '#/components/schemas/tmp.cidr_generator' + type: array + type: array + description: Request erfolgreich + 400: + description: Eingabefehler + 401: + description: Unautorisiert + 500: + description: Interner Serverfehler + security: + - api_key: [] + tags: + - tmp + /tmp/diag4gpk/list: + get: + parameters: + - description: WebAPI-Systemname + in: query + name: system_name + required: false + schema: + nullable: false + type: string + - description: Name, unter dem die Tabelle incl. deren als WebAPI-Attribut gekennzeichneten + Spalten als Web-API-Objekttyp angesprochen werden kann. + in: query + name: object_type_name + required: false + schema: + nullable: false + type: string + responses: + 200: + content: + application/json: + schema: + items: + items: + $ref: '#/components/schemas/tmp.diag4gpk' type: array type: array description: Request erfolgreich diff --git a/4.2/python/tmp.py b/4.2/python/tmp.py index cca3420c4a51c5114de4766e571f25f922aed6d6..9a9dcb607e9ea6a612708d7c8ccfa53f1f1eaec4 100644 --- a/4.2/python/tmp.py +++ b/4.2/python/tmp.py @@ -111,7 +111,7 @@ class Diag4gpk(APIObject): return [cls(**s) for s in res.json()[0]] @dataclass() -class GenericCidr(APIObject): +class CidrGenerator(APIObject): value: str base_value: str @@ -138,7 +138,7 @@ class GenericCidr(APIObject): if masklen_summand_list_old is not None and not (isinstance(masklen_summand_list_old, list)): raise ValueError(f"'masklen_summand_list' of incorrect type. Expected list, got {type(masklen_summand_list_old)}") - return {'name': 'tmp.generic_cidr.list', 'new': _denullify_dict({}), 'old': _denullify_dict({'value_limit': value_limit_old, 'value_offset': value_offset_old, 'base_value_list': base_value_list_old, 'masklen_summand': masklen_summand_old, 'value_limit_list': value_limit_list_old, 'value_offset_list': value_offset_list_old, 'masklen_summand_list': masklen_summand_list_old})} + return {'name': 'tmp.cidr_generator.list', 'new': _denullify_dict({}), 'old': _denullify_dict({'value_limit': value_limit_old, 'value_offset': value_offset_old, 'base_value_list': base_value_list_old, 'masklen_summand': masklen_summand_old, 'value_limit_list': value_limit_list_old, 'value_offset_list': value_offset_list_old, 'masklen_summand_list': masklen_summand_list_old})} # TODO: Consider is_returning @classmethod diff --git a/4.2/version_numeric b/4.2/version_numeric index ec87108d821a5ba83a1650f5418ed577397d7cdc..d38b4cc81235bff5f88bf3f179bc18827c5c38da 100644 --- a/4.2/version_numeric +++ b/4.2/version_numeric @@ -1 +1 @@ -4.2.3 \ No newline at end of file +4.2.27 \ No newline at end of file diff --git a/latest_version b/latest_version index ec87108d821a5ba83a1650f5418ed577397d7cdc..d38b4cc81235bff5f88bf3f179bc18827c5c38da 100644 --- a/latest_version +++ b/latest_version @@ -1 +1 @@ -4.2.3 \ No newline at end of file +4.2.27 \ No newline at end of file