Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaceaac7

Browse files
authored
fix allowed_addresses (#4)
1 parentb86df12 commitaceaac7

File tree

7 files changed

+24
-229
lines changed

7 files changed

+24
-229
lines changed

‎services/iaasalpha/stackit/iaasalpha/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
fromstackit.iaasalpha.models.add_volume_to_server_payloadimport (
3838
AddVolumeToServerPayload,
3939
)
40-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
4140
fromstackit.iaasalpha.models.areaimportArea
4241
fromstackit.iaasalpha.models.area_configimportAreaConfig
4342
fromstackit.iaasalpha.models.area_idimportAreaId

‎services/iaasalpha/stackit/iaasalpha/models/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
fromstackit.iaasalpha.models.add_volume_to_server_payloadimport (
1919
AddVolumeToServerPayload,
2020
)
21-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
2221
fromstackit.iaasalpha.models.areaimportArea
2322
fromstackit.iaasalpha.models.area_configimportAreaConfig
2423
fromstackit.iaasalpha.models.area_idimportAreaId

‎services/iaasalpha/stackit/iaasalpha/models/allowed_addresses_inner.py‎

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎services/iaasalpha/stackit/iaasalpha/models/create_nic_payload.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@
2929
)
3030
fromtyping_extensionsimportAnnotated,Self
3131

32-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
33-
3432

3533
classCreateNICPayload(BaseModel):
3634
"""
3735
Object that represents a network interface.
3836
"""
3937

40-
allowed_addresses:Optional[List[AllowedAddressesInner]]=Field(
38+
allowed_addresses:Optional[List[StrictStr]]=Field(
4139
default=None,description="A list of IPs or CIDR notations.",alias="allowedAddresses"
4240
)
4341
device:Optional[Annotated[str,Field(min_length=36,strict=True,max_length=36)]]=Field(
@@ -228,13 +226,6 @@ def to_dict(self) -> Dict[str, Any]:
228226
exclude=excluded_fields,
229227
exclude_none=True,
230228
)
231-
# override the default output from pydantic by calling `to_dict()` of each item in allowed_addresses (list)
232-
_items= []
233-
ifself.allowed_addresses:
234-
for_iteminself.allowed_addresses:
235-
if_item:
236-
_items.append(_item.to_dict())
237-
_dict["allowedAddresses"]=_items
238229
return_dict
239230

240231
@classmethod
@@ -248,11 +239,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
248239

249240
_obj=cls.model_validate(
250241
{
251-
"allowedAddresses": (
252-
[AllowedAddressesInner.from_dict(_item)for_iteminobj["allowedAddresses"]]
253-
ifobj.get("allowedAddresses")isnotNone
254-
elseNone
255-
),
242+
"allowedAddresses":obj.get("allowedAddresses"),
256243
"device":obj.get("device"),
257244
"id":obj.get("id"),
258245
"ipv4":obj.get("ipv4"),

‎services/iaasalpha/stackit/iaasalpha/models/nic.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@
2929
)
3030
fromtyping_extensionsimportAnnotated,Self
3131

32-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
33-
3432

3533
classNIC(BaseModel):
3634
"""
3735
Object that represents a network interface.
3836
"""
3937

40-
allowed_addresses:Optional[List[AllowedAddressesInner]]=Field(
38+
allowed_addresses:Optional[List[StrictStr]]=Field(
4139
default=None,description="A list of IPs or CIDR notations.",alias="allowedAddresses"
4240
)
4341
device:Optional[Annotated[str,Field(min_length=36,strict=True,max_length=36)]]=Field(
@@ -228,13 +226,6 @@ def to_dict(self) -> Dict[str, Any]:
228226
exclude=excluded_fields,
229227
exclude_none=True,
230228
)
231-
# override the default output from pydantic by calling `to_dict()` of each item in allowed_addresses (list)
232-
_items= []
233-
ifself.allowed_addresses:
234-
for_iteminself.allowed_addresses:
235-
if_item:
236-
_items.append(_item.to_dict())
237-
_dict["allowedAddresses"]=_items
238229
return_dict
239230

240231
@classmethod
@@ -248,11 +239,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
248239

249240
_obj=cls.model_validate(
250241
{
251-
"allowedAddresses": (
252-
[AllowedAddressesInner.from_dict(_item)for_iteminobj["allowedAddresses"]]
253-
ifobj.get("allowedAddresses")isnotNone
254-
elseNone
255-
),
242+
"allowedAddresses":obj.get("allowedAddresses"),
256243
"device":obj.get("device"),
257244
"id":obj.get("id"),
258245
"ipv4":obj.get("ipv4"),

‎services/iaasalpha/stackit/iaasalpha/models/server_network.py‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,23 @@
1919
importre
2020
fromtypingimportAny,ClassVar,Dict,List,Optional,Set
2121

22-
frompydanticimportBaseModel,ConfigDict,Field,StrictBool,field_validator
22+
frompydanticimport (
23+
BaseModel,
24+
ConfigDict,
25+
Field,
26+
StrictBool,
27+
StrictStr,
28+
field_validator,
29+
)
2330
fromtyping_extensionsimportAnnotated,Self
2431

25-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
26-
2732

2833
classServerNetwork(BaseModel):
2934
"""
3035
Describes the object that matches servers to its networks.
3136
"""
3237

33-
allowed_addresses:Optional[List[AllowedAddressesInner]]=Field(
38+
allowed_addresses:Optional[List[StrictStr]]=Field(
3439
default=None,description="A list of IPs or CIDR notations.",alias="allowedAddresses"
3540
)
3641
ipv4:Optional[Annotated[str,Field(strict=True)]]=Field(
@@ -186,13 +191,6 @@ def to_dict(self) -> Dict[str, Any]:
186191
exclude=excluded_fields,
187192
exclude_none=True,
188193
)
189-
# override the default output from pydantic by calling `to_dict()` of each item in allowed_addresses (list)
190-
_items= []
191-
ifself.allowed_addresses:
192-
for_iteminself.allowed_addresses:
193-
if_item:
194-
_items.append(_item.to_dict())
195-
_dict["allowedAddresses"]=_items
196194
return_dict
197195

198196
@classmethod
@@ -206,11 +204,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
206204

207205
_obj=cls.model_validate(
208206
{
209-
"allowedAddresses": (
210-
[AllowedAddressesInner.from_dict(_item)for_iteminobj["allowedAddresses"]]
211-
ifobj.get("allowedAddresses")isnotNone
212-
elseNone
213-
),
207+
"allowedAddresses":obj.get("allowedAddresses"),
214208
"ipv4":obj.get("ipv4"),
215209
"ipv6":obj.get("ipv6"),
216210
"mac":obj.get("mac"),

‎services/iaasalpha/stackit/iaasalpha/models/update_nic_payload.py‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,23 @@
1919
importre
2020
fromtypingimportAny,ClassVar,Dict,List,Optional,Set
2121

22-
frompydanticimportBaseModel,ConfigDict,Field,StrictBool,field_validator
22+
frompydanticimport (
23+
BaseModel,
24+
ConfigDict,
25+
Field,
26+
StrictBool,
27+
StrictStr,
28+
field_validator,
29+
)
2330
fromtyping_extensionsimportAnnotated,Self
2431

25-
fromstackit.iaasalpha.models.allowed_addresses_innerimportAllowedAddressesInner
26-
2732

2833
classUpdateNICPayload(BaseModel):
2934
"""
3035
Object that represents a network interface update.
3136
"""
3237

33-
allowed_addresses:Optional[List[AllowedAddressesInner]]=Field(
38+
allowed_addresses:Optional[List[StrictStr]]=Field(
3439
default=None,description="A list of IPs or CIDR notations.",alias="allowedAddresses"
3540
)
3641
labels:Optional[Dict[str,Any]]=Field(
@@ -96,13 +101,6 @@ def to_dict(self) -> Dict[str, Any]:
96101
exclude=excluded_fields,
97102
exclude_none=True,
98103
)
99-
# override the default output from pydantic by calling `to_dict()` of each item in allowed_addresses (list)
100-
_items= []
101-
ifself.allowed_addresses:
102-
for_iteminself.allowed_addresses:
103-
if_item:
104-
_items.append(_item.to_dict())
105-
_dict["allowedAddresses"]=_items
106104
return_dict
107105

108106
@classmethod
@@ -116,11 +114,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
116114

117115
_obj=cls.model_validate(
118116
{
119-
"allowedAddresses": (
120-
[AllowedAddressesInner.from_dict(_item)for_iteminobj["allowedAddresses"]]
121-
ifobj.get("allowedAddresses")isnotNone
122-
elseNone
123-
),
117+
"allowedAddresses":obj.get("allowedAddresses"),
124118
"labels":obj.get("labels"),
125119
"name":obj.get("name"),
126120
"nicSecurity":obj.get("nicSecurity"),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp