Skip to content

feat(schema): switch cpu_models to cpu_model #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2024
Merged

feat(schema): switch cpu_models to cpu_model #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python/ironic-understack/ironic_understack/flavor_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def from_yaml(yaml_str: str) -> "FlavorSpec":
model=data["model"],
memory_gb=data["memory_gb"],
cpu_cores=data["cpu_cores"],
cpu_model=data.get("cpu_model", data.get("cpu_models", [""]).pop()),
cpu_model=data["cpu_model"],
drives=data["drives"],
pci=data.get("pci", []),
)
Expand Down
12 changes: 1 addition & 11 deletions schema/flavor.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,6 @@
"description": "Processor model",
"type": "string"
},
"cpu_models": {
"description": "Processor models",
"type": "array",
"items": {
"type": "string",
"description": "Processor model"
},
"minItems": 1,
"maxItems": 1
},
"memory_gb": {
"description": "Total memory in GB",
"type": "number"
Expand Down Expand Up @@ -80,5 +70,5 @@
}
}
},
"required": [ "name", "manufacturer", "model", "cpu_cores", "cpu_models", "memory_gb", "drives" ]
"required": [ "name", "manufacturer", "model", "cpu_cores", "cpu_model", "memory_gb", "drives" ]
}