Fix schemas

_schemas/configs/network/connection.schema

@@ -7,6 +7,6 @@ receiver_id:
 
 mplb:
   _type: one-of
-  _variants:
-    - single-cc
-  _doc: Multi path load ballancer that should be used for transreffing data parts by this connection
+  _options:
+    - single-cc: singe-cc.schema
+  _doc: Multi path load ballancer that should be used for transreffing data parts by this connection

_schemas/configs/network/mplb/cc/cc-metrics.schema

@@ -0,0 +1,5 @@
+metrics_filters:
+  cwnd:
+    _type: bool
+    _default: true
+    _doc: Is it need to collect congestion window metric

_schemas/configs/network/mplb/cc/metricable-cc.schema

@@ -1,11 +1,8 @@
 _type: one-of
 
-_variants:
-  - basic
-  - swift
-  - tahoe
+_options:
+- basic: basic.schema
+- swift: swift.schema
+- tahoe: tahoe.schema
 
-cwnd:
-  _type: bool
-  _default: true
-  _doc: Is it need to collect congestion window metric
+_extend: cc-metrics.schema

_schemas/configs/network/mplb/cc/swift.schema

@@ -1,5 +1,5 @@
-base_target: 
-  _type: units/Time
+base_target:
+  _type: /units/Time.schema
   _doc: Minimal (fabric link with 1 hop) RTT
 
 start_cwnd:
@@ -31,12 +31,12 @@ fs_min_cwnd:
   _type: double
   _default: 0.1
   _doc: cwnd where flow-scaling hits fs_range
-  
+
 fs_max_cwnd:
   _type: double
   _default: 100.0
   _doc: cwnd where flow-scaling goes to zero
 
 metrics_filters:
-  _default: 
-  cwnd: false
+  _default:
+  cwnd: false

_schemas/configs/network/mplb/path-chooser/flow.schema

@@ -1,3 +1,3 @@
 _type: one-of
-_variants:
-  - tcp-flow
+_options:
+  - tcp-flow: tcp_flow.schema

_schemas/configs/network/mplb/path-chooser/round-robin.schema

@@ -1,3 +1,4 @@
 flows:
-  _type: flow{}
-  _doc: List of avalable flows
+  _type: map
+  _key_type: flow.schema
+  _doc: Map of avalable flows

_schemas/configs/network/mplb/path-chooser/tcp-flow.schema

@@ -1,17 +1,17 @@
 rto:
   start:
-    _type: units/Time
+    _type: /units/Time.schema
     _default: 2000ns
     _doc: Initial retransmit timout
   max:
-    _type: units/Time
+    _type: /units/Time.schema
     _default: 1s
     _doc: Maximal retransmit timeout
 
 ecn_capable:
   _type: bool
   _default: false
-  _doc: Does flow supports explicit congestion notification  
+  _doc: Does flow supports explicit congestion notification
 
 metrics_filters:
   rtt:
@@ -26,4 +26,3 @@ metrics_filters:
     _type: bool
     _default: true
     _doc: Is it need to collect delivery rate statistice
-

_schemas/configs/network/mplb/single-cc.schema

@@ -1,14 +1,14 @@
 packet-size:
-  _type: units/Size
+  _type: /units/Size.schema
   _doc: Size of packets that will be used
 
 cc:
-  _type: cc/metricable_cc
+  _type: cc/metricable-cc.schema
   _doc: Congestion control
 
 path-chooser:
   _type: one-of
-  _variants:
-    - path-chooser/round-robin
+  _options:
+    - round-robin: path-chooser/round-robin.schema
 
   _doc: Path chooser that should be used

_schemas/configs/network/network.schema

@@ -1,7 +1,8 @@
 topology_config_path:
   _type: string
-  _doc: Path ro topology config. Might be absolute or relative  
+  _doc: Path ro topology config. Might be absolute or relative
 
 connections:
-  _type: connection{}
-  _doc: List of abailable connections - user interfaces of data transreffing  
+  _type: map
+  _key_type: connection.schema
+  _doc: Map of abailable connections - user interfaces of data transreffing

_schemas/configs/scenario/actions/action.schema

@@ -1,7 +1,7 @@
 action:
   _type: one-of
-  _variants:
-    - send_data
-    - stop_time
-  
-  _doc: 
+  _options:
+    - send_data: send_data.schema
+    - stop_time: stop_time.schema
+
+  _doc:

_schemas/configs/scenario/actions/send_data.schema

@@ -1,17 +1,17 @@
-id: 
+id:
   _type: string
-  _doc: Id of action. Should be unique 
+  _doc: Id of action. Should be unique
 when:
-  _type: units/Time
+  _type: /units/Time.schema
   _doc: The time at which the data will start being sent
 size:
-  _type: Size
+  _type: /units/Size.schema
   _doc: The amount of data to send
-connections: 
+connections:
   _type: string
   _doc: Specifies which connections to use for sending data. Supports regular expression
 repeat_count:
-  _type: unsigned int
+  _type: size_t
   _default: 1
   _doc: Sets the number of times to perform an action
 repeat_interval:

_schemas/configs/scenario/actions/stop_time.schema

@@ -1,3 +1,3 @@
 time:
-  _type: units/Time
-  _doc: Time to stop simulation
+  _type: /units/Time.schema
+  _doc: Time to stop simulation

_schemas/configs/scenario/scenario-config.schema

@@ -3,5 +3,6 @@ network_config_path:
   _doc: path (absolute or relative) to network config.
 
 scenario:
-  _type: actions/action[]
-  _doc: List of actions
+  _type: list
+  _elem_type: actions/action.schema
+  _doc: List of actions

_schemas/configs/topology/common/link.schema

@@ -1,8 +1,8 @@
-follow: link_params.schema
+_extend: link_params.schema
 
 from:
   _type: string
-  _doc: Link start device 
+  _doc: Link start device
 to:
   _type: string
-  _doc: Link end device
+  _doc: Link end device

_schemas/configs/topology/common/link_params.schema

@@ -1,21 +1,21 @@
 latency:
-  _type: units/Time
-  _doc: Speed of light latency of packet transmission  
+  _type: /units/Time.schema
+  _doc: Speed of light latency of packet transmission
 
-throughput: 
-  _type: units/Speed  
+throughput:
+  _type: /units/Speed.schema
   _doc: Throughput of link
 
 ingress_buffer_size:
-  type: units/Size  
+  type: /units/Size.schema
   _doc: Ingress device buffer size
 
 egress_buffer_size:
-  type: units/Size
+  type: /units/Size.schema
   _doc: Eggress device buffer size
 
 metrics_filters:
   queue_sizes:
     _type: bool
     _default: true
-    _doc: Is it need to collect queue size metrics  
+    _doc: Is it need to collect queue size metrics

_schemas/configs/topology/common/packet-spraying/flowlet.schema

@@ -1,4 +1,3 @@
 threshold:
-  _type: units/Time
-  _doc: Threshold of packet pauses to begin new flowlet 
-
+  _type: /units/Time.schema
+  _doc: Threshold of packet pauses to begin new flowlet

_schemas/configs/topology/common/packet-spraying/packet-spraying.schema

@@ -0,0 +1,8 @@
+_type: one-of
+_options:
+  - adaptive_flowlet: adaptive_flowlet.schema
+  - ecmp: ecmp.schema
+  - flowlet: flowlet.schema
+  - random: random.schema
+  - salt: salt.schema
+_doc: Available packet spraying types

_schemas/configs/topology/custom.schema

@@ -1,19 +1,18 @@
 packet-spraying:
-  _type: derived
-  _derived: configs/topology/common/empty-packet-spraying.schema
+  _type: packet-spraying/packet-spraying.schema
   _doc: Packet spraying for all switches
 
-packet-spraying:
-  type: ecmp
-
 hosts:
-  _type: configs/topology/common/host{}
-  _doc: Hosts description
+  _type: map
+  _key_type: common/host.schema
+  _doc: Hosts map
 
 switches:
-  _type: configs/topology/common/switch{}
-  _doc: Hosts list
+  _type: map
+  _key_type: common/switch.schema
+  _doc: Switches map
 
 links:
-  _type: configs/topology/common/link{}
-  _doc: Links list
+  _type: map
+  _key_type: common/link.schema
+  _doc: Links map

_schemas/configs/topology/fat-tree.schema

@@ -1,38 +1,37 @@
 packet-spraying:
-  _type: derived
-  _derived: common/empty-packet-spraying.schema
+  _type: packet-spraying/packet-spraying.schema
   _doc: Packet spraying for all switches
 
 switches:
   ports-count:
-    _type: unsigned int
+    _type: size_t
     _doc: Count of ports of each switch (k from common pictures)
-  
+
   core:
-    _type: common/switch
+    _type: common/switch.schema
     _doc: Core layer switches description
-  aggr: 
-    _type: common/switch
+  aggr:
+    _type: common/switch.schema
     _doc: Aggredtion layer switches description
 
   edge:
-    _type: common/switch
-    
+    _type: common/switch.schema
+
     _doc: Edge layer switches description
 
 hosts:
-  _type: common/host
+  _type: common/host.schema
   _doc: Hosts description
 
 links:
   core-aggr:
-    _type: common/link_params
+    _type: common/link_params.schema
     _doc: Parameters of links between core and aggregation layers
-  
+
   aggr-edge:
-    _type: common/link_params
+    _type: common/link_params.schema
     _doc: Parameters of links between aggregation and edge layers
-  
+
   edge-host:
-    _type: common/link_params
-    _doc: Parameters of links between edge switches and hosts
+    _type: common/link_params.schema
+    _doc: Parameters of links between edge switches and hosts

_schemas/configs/topology/incast.schema

@@ -1,26 +1,25 @@
 packet-spraying:
-  _type: derived
-  _derived: configs/topology/common/empty-packet-spraying.schema
+  _type: common/packet-spraying/packet-spraying.schema
   _doc: Packet spraying for all switches
 
-links:
-  _type: configs/topology/common/link_params.schema
-  _doc: Parameters of links
-
-bottleneck-link:
-  _type: configs/topology/common/link_params.schema
-  _doc: Parameters of bottleneck link. If not set, bottleneck link parameters takes from links section
-
 senders:
   count:
-    _type: unsigned int
+    _type: size_t
     _doc: Count of senders
-  follow: configs/topology/common/host.schema
+  _extend: common/host.schema
 
 switch:
-  _type: configs/topology/common/switch
+  _type: common/switch.schema
   _doc: Switch parameters
 
 receiver:
-  _type: configs/topology/common/host
+  _type: common/host.schema
   _doc: Receiver parameters
+
+links:
+  _type: common/link_params.schema
+  _doc: Parameters of links between senders and switch
+
+bottleneck-link:
+  _type: common/link_params.schema
+  _doc: Parameters of bottleneck link between switch and receiver.