arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Code Issues Releases Wiki Activity

Use uuid5 to create new compute_id. Fixes #1641 #1887

Browse Source
This commit is contained in:
grossmj 2021-04-21 13:47:32 +09:30
parent dff1ec9bc6
commit a02aede1b0
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gns3server/schemas/controller/computes.py
View File

@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import uuid
from pydantic import BaseModel, Field, SecretStr, validator from pydantic import BaseModel, Field, SecretStr, validator
from typing import List, Optional, Union from typing import List, Optional, Union
from uuid import UUID, uuid4
from enum import Enum from enum import Enum
from .nodes import NodeType from .nodes import NodeType
@ -49,7 +50,7 @@ class ComputeCreate(ComputeBase):
Data to create a compute. Data to create a compute.
""" """
compute_id: Union[str, UUID] = Field(default_factory=uuid4) compute_id: Union[str, uuid.UUID] = None
password: Optional[SecretStr] = None password: Optional[SecretStr] = None
class Config: class Config:
@ -63,7 +64,18 @@ class ComputeCreate(ComputeBase):
} }
} }
@validator("name", always=True) @validator("compute_id", pre=True, always=True)
def default_compute_id(cls, v, values):
if v is not None:
return v
else:
protocol = values.get("protocol")
host = values.get("host")
port = values.get("port")
return uuid.uuid5(uuid.NAMESPACE_URL, f"{protocol}://{host}:{port}")
@validator("name", pre=True, always=True)
def generate_name(cls, name, values): def generate_name(cls, name, values):
if name is not None: if name is not None:
@ -119,7 +131,7 @@ class Compute(DateTimeModelMixin, ComputeBase):
Data returned for a compute. Data returned for a compute.
""" """
compute_id: Union[str, UUID] compute_id: Union[str, uuid.UUID]
name: str name: str
connected: Optional[bool] = Field(None, description="Whether the controller is connected to the compute or not") connected: Optional[bool] = Field(None, description="Whether the controller is connected to the compute or not")
cpu_usage_percent: Optional[float] = Field(None, description="CPU usage of the compute", ge=0, le=100) cpu_usage_percent: Optional[float] = Field(None, description="CPU usage of the compute", ge=0, le=100)

6
tests/api/routes/controller/test_computes.py
View File

@ -84,7 +84,7 @@ class TestComputeRoutes:
params = { params = {
"protocol": "http", "protocol": "http",
"host": "localhost", "host": "localhost",
"port": 84, "port": 42,
"user": "julien", "user": "julien",
"password": "secure" "password": "secure"
} }
@ -133,7 +133,7 @@ class TestComputeFeatures:
params = { params = {
"protocol": "http", "protocol": "http",
"host": "localhost", "host": "localhost",
"port": 84, "port": 4242,
"user": "julien", "user": "julien",
"password": "secure" "password": "secure"
} }
@ -151,7 +151,7 @@ class TestComputeFeatures:
params = { params = {
"protocol": "http", "protocol": "http",
"host": "localhost", "host": "localhost",
"port": 84, "port": 4284,
"user": "julien", "user": "julien",
"password": "secure" "password": "secure"
} }