X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Fschemas.py;h=6c0a8489b42bb60b71436b7a3248fcf299603c47;hp=101bcb1d6596e988827d64401719a1750d5c27d4;hb=aed948dcfe3e1586c184fd31abacbd3b89eb2a2d;hpb=7d782eff123e5b44d41437377ccca66ad1e8b21b

diff --git a/RO/osm_ro/wim/schemas.py b/RO/osm_ro/wim/schemas.py
index 101bcb1d..6c0a8489 100644
--- a/RO/osm_ro/wim/schemas.py
+++ b/RO/osm_ro/wim/schemas.py
@@ -39,7 +39,7 @@ from ..openmano_schemas import (
 )
 
 # WIM -------------------------------------------------------------------------
-wim_types = ["tapi", "onos", "odl", "dynpac", "fake"]
+wim_types = ["ietfl2vpn", "dynpac", "arista_cloudvision", "floodlightof", "onosof", "onos_vpls", "odlof", "dummy"]
 
 dpid_type = {
     "type": "string",
@@ -69,36 +69,21 @@ wim_port_mapping_desc = {
                 "items": {
                     "type": "object",
                     "properties": {
-                        "pop_switch_dpid": dpid_type,
-                        "pop_switch_port": port_type,
-                        "wan_service_endpoint_id": name_schema,
-                        "wan_service_mapping_info": {
+                        "device_id": nameshort_schema,
+                        "device_interface_id": nameshort_schema,
+                        "service_endpoint_id": name_schema,
+                        "switch_dpid": dpid_type,
+                        "switch_port": port_type,
+                        "service_mapping_info": {
                             "type": "object",
                             "properties": {
                                 "mapping_type": name_schema,
-                                "wan_switch_dpid": dpid_type,
-                                "wan_switch_port": port_type
                             },
                             "additionalProperties": True,
                             "required": ["mapping_type"]
                         }
                     },
-                    "anyOf": [
-                        {
-                            "required": [
-                                "pop_switch_dpid",
-                                "pop_switch_port",
-                                "wan_service_endpoint_id"
-                            ]
-                        },
-                        {
-                            "required": [
-                                "pop_switch_dpid",
-                                "pop_switch_port",
-                                "wan_service_mapping_info"
-                            ]
-                        }
-                    ]
+                    "required": ["service_endpoint_id"]
                 }
             }
         },
@@ -111,7 +96,7 @@ wim_schema_properties = {
     "description": description_schema,
     "type": {
         "type": "string",
-        "enum": ["tapi", "onos", "odl", "dynpac", "fake"]
+        # "enum": ["ietfl2vpn", "onos", "odl", "dynpac", "dummy", ...]
     },
     "wim_url": description_schema,
     "config": {