drop vlan-id from the gre tunnel definition

tunnels should use interface.vlan.id

Signed-off-by: John Crispin <john@phrozen.org>

schema/interface.tunnel.gre.yml

@@ -14,9 +14,3 @@ properties:
     type: string
     format: ipv4
     example: '192.168.100.1'
-  vlan-id:
-    description:
-      This is the id of the vlan that shall be assigned to the interface.
-    type: integer
-    maximum: 4096
-

schemareader.uc

@@ -3843,23 +3843,6 @@ function instantiateInterfaceTunnelGre(location, value, errors) {
 			obj.peer_address = parsePeerAddress(location + "/peer-address", value["peer-address"], errors);
 		}
 
-		function parseVlanId(location, value, errors) {
-			if (type(value) in [ "int", "double" ]) {
-				if (value > 4096)
-					push(errors, [ location, "must be lower than or equal to 4096" ]);
-
-			}
-
-			if (type(value) != "int")
-				push(errors, [ location, "must be of type integer" ]);
-
-			return value;
-		}
-
-		if (exists(value, "vlan-id")) {
-			obj.vlan_id = parseVlanId(location + "/vlan-id", value["vlan-id"], errors);
-		}
-
 		return obj;
 	}
 

ucentral.schema.json

@@ -1486,10 +1486,6 @@
                     "type": "string",
                     "format": "ipv4",
                     "example": "192.168.100.1"
-                },
-                "vlan-id": {
-                    "type": "integer",
-                    "maximum": 4096
                 }
             }
         },