Merge branch '3.0' into image-management-refactoring

gns3server/schemas/__init__.py

@@ -28,7 +28,7 @@ from .controller.drawings import Drawing
 from .controller.gns3vm import GNS3VM
 from .controller.nodes import NodeCreate, NodeUpdate, NodeDuplicate, NodeCapture, Node
 from .controller.projects import ProjectCreate, ProjectUpdate, ProjectDuplicate, Project, ProjectFile
-from .controller.users import UserCreate, UserUpdate, User, Credentials, UserGroupCreate, UserGroupUpdate, UserGroup
+from .controller.users import UserCreate, UserUpdate, LoggedInUserUpdate, User, Credentials, UserGroupCreate, UserGroupUpdate, UserGroup
 from .controller.rbac import RoleCreate, RoleUpdate, Role, PermissionCreate, PermissionUpdate, Permission
 from .controller.tokens import Token
 from .controller.snapshots import SnapshotCreate, Snapshot

gns3server/schemas/controller/links.py

@@ -42,6 +42,13 @@ class LinkType(str, Enum):
     serial = "serial"
 
 
+class LinkStyle(BaseModel):
+
+    color: Optional[str] = None
+    width: Optional[int] = None
+    type: Optional[int] = None
+
+
 class LinkBase(BaseModel):
     """
     Link data.
@@ -49,6 +56,7 @@ class LinkBase(BaseModel):
 
     nodes: Optional[List[LinkNode]] = Field(None, min_items=0, max_items=2)
     suspend: Optional[bool] = None
+    link_style: Optional[LinkStyle] = None
     filters: Optional[dict] = None
 
 

gns3server/schemas/controller/users.py

@@ -28,6 +28,7 @@ class UserBase(BaseModel):
     """
 
     username: Optional[str] = Field(None, min_length=3, regex="[a-zA-Z0-9_-]+$")
+    is_active: bool = True
     email: Optional[EmailStr]
     full_name: Optional[str]
 
@@ -49,11 +50,20 @@ class UserUpdate(UserBase):
     password: Optional[SecretStr] = Field(None, min_length=6, max_length=100)
 
 
+class LoggedInUserUpdate(BaseModel):
+    """
+    Properties to update a logged in user.
+    """
+
+    password: Optional[SecretStr] = Field(None, min_length=6, max_length=100)
+    email: Optional[EmailStr]
+    full_name: Optional[str]
+
+
 class User(DateTimeModelMixin, UserBase):
 
     user_id: UUID
     last_login: Optional[datetime] = None
-    is_active: bool = True
     is_superadmin: bool = False
 
     class Config: