fixes

Author: petercrocker

menus/menu-full.yml

@@ -42,6 +42,12 @@ spec:
                   icon: "mdi:ethernet"
                   kind: DcimInterface
 
+                - name: VLAN
+                  namespace: Dcim
+                  label: "VLANs"
+                  icon: "mdi:ethernet"
+                  kind: IpamVLAN
+
                 - name: GenericSFP
                   namespace: Dcim
                   label: "SFP Modules"

schemas/base/dcim.yml

@@ -457,6 +457,7 @@ nodes:
     label: Network Device
     description: A configurable network device for managing and directing data traffic, including routers, switches...
     icon: clarity:network-switch-solid
+    include_in_menu: false
     generate_template: true
     namespace: Dcim
     inherit_from:

schemas/extensions/cable/cable.yml

@@ -7,6 +7,7 @@ nodes:
     namespace: Dcim
     description: Physical cable connecting two endpoints
     label: Cable
+    include_in_menu: false
     icon: mdi:cable-data
     inherit_from:
       - DcimConnector

schemas/extensions/vlan/vlan.yml

@@ -80,6 +80,7 @@ nodes:
     description: Represents layer 2 domain.
     label: Layer 2 Domain
     icon: mdi:domain-switch
+    include_in_menu: false
     human_friendly_id:
       - name__value
     display_label: name__value

service_catalog/utils/rack.py

@@ -342,8 +342,8 @@ def _generate_rack_css() -> str:
 
     .device {
         height: 100%;
-        border: 2px solid #2E7D32;
-        color: white;
+        border: 2px solid #a8a8cc;
+        color: #333;
         padding: 2px 8px;
         text-align: center;
         font-size: 12px;
@@ -353,7 +353,7 @@ def _generate_rack_css() -> str:
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        background-color: #4CAF50;
+        background-color: #e6e6fa;
         border-radius: 3px;
         box-sizing: border-box;
         transition: all 0.2s ease;
@@ -371,7 +371,7 @@ def _generate_rack_css() -> str:
         overflow: hidden;
         text-overflow: ellipsis;
         line-height: 1.2;
-        text-shadow: 0 1px 2px rgba(0,0,0,0.3);
+        text-shadow: 0 1px 1px rgba(255,255,255,0.5);
         width: 100%;
     }
 
@@ -383,43 +383,57 @@ def _generate_rack_css() -> str:
         text-overflow: ellipsis;
         margin-top: 1px;
         line-height: 1.1;
-        text-shadow: 0 1px 1px rgba(0,0,0,0.2);
+        text-shadow: 0 1px 1px rgba(255,255,255,0.3);
         width: 100%;
     }
 
-    /* Role-based color classes */
+    /* Role-based color classes - colors match schemas/base/dcim.yml */
     .device-role-leaf {
-        background-color: #4CAF50;
-        border-color: #2E7D32;
+        background-color: #e6e6fa;
+        border-color: #a8a8cc;
     }
 
     .device-role-spine {
-        background-color: #2196F3;
-        border-color: #1565C0;
+        background-color: #aeeeee;
+        border-color: #7cb8b8;
     }
 
     .device-role-border-leaf {
-        background-color: #9C27B0;
-        border-color: #6A1B9A;
+        background-color: #dda0dd;
+        border-color: #b070b0;
     }
 
     .device-role-console {
-        background-color: #FF9800;
-        border-color: #E65100;
+        background-color: #e8e7ad;
+        border-color: #b8b77d;
     }
 
     .device-role-oob {
-        background-color: #795548;
-        border-color: #4E342E;
+        background-color: #e8e7ed;
+        border-color: #b8b7bd;
     }
 
     .device-role-edge {
-        background-color: #00BCD4;
-        border-color: #00838F;
+        background-color: #bf7fbf;
+        border-color: #8f4f8f;
     }
 
     .device-role-firewall {
-        background-color: #F44336;
-        border-color: #C62828;
+        background-color: #6a5acd;
+        border-color: #4a3a9d;
+        color: white;
+    }
+
+    .device-role-firewall .device-name {
+        text-shadow: 0 1px 2px rgba(0,0,0,0.3);
+    }
+
+    .device-role-firewall .device-type-label {
+        text-shadow: 0 1px 1px rgba(0,0,0,0.2);
+    }
+
+    .device-role-load-balancer {
+        background-color: #38e7fb;
+        border-color: #08b7cb;
     }
     """

service_catalog/utils/ui.py

@@ -197,7 +197,7 @@ def get_device_color(device_role: Optional[str]) -> str:
     """Get CSS color class for device based on role.
 
     Args:
-        device_role: Device role (e.g., "leaf", "spine", "border_leaf", "console", "oob").
+        device_role: Device role (e.g., "leaf", "spine", "border_leaf", "console", "oob", "load_balancer").
 
     Returns:
         str: CSS class name for device color styling.
@@ -217,6 +217,7 @@ def get_device_color(device_role: Optional[str]) -> str:
         "edge": "device device-role-edge",
         "dc_firewall": "device device-role-firewall",
         "edge_firewall": "device device-role-firewall",
+        "load_balancer": "device device-role-load-balancer",
     }
 
     return role_color_map.get(device_role_lower, "device")
@@ -227,15 +228,17 @@ def get_role_legend() -> Dict[str, str]:
 
     Returns:
         Dict mapping role names to color hex codes for legend display.
+        Colors match the DcimDevice role attribute in schemas/base/dcim.yml
     """
     return {
-        "Leaf": "#4CAF50",           # Green
-        "Spine": "#2196F3",          # Blue
-        "Border Leaf": "#9C27B0",    # Purple
-        "Console": "#FF9800",        # Orange
-        "OOB": "#795548",            # Brown
-        "Edge": "#00BCD4",           # Cyan
-        "Firewall": "#F44336",       # Red
+        "Leaf": "#e6e6fa",           # Lavender
+        "Spine": "#aeeeee",          # Pale cyan
+        "Border Leaf": "#dda0dd",    # Plum
+        "Console": "#e8e7ad",        # Pale yellow
+        "OOB": "#e8e7ed",            # Very pale lavender
+        "Edge": "#bf7fbf",           # Medium purple
+        "Firewall": "#6a5acd",       # Slate blue (dc_firewall and edge_firewall)
+        "Load Balancer": "#38e7fb",  # Cyan
     }