newest schema before interop (#116)

Merge pull request from Tony P.: Upgrade YANG schema.

requirements-3-10.txt

@@ -3,14 +3,14 @@ appdirs==1.4.4
 astroid==2.12.7
 atomicwrites==1.4.1
 attrs==22.1.0
-awscli==1.25.67
-botocore==1.27.66
+awscli==1.29.62
+botocore==1.31.62
 CacheControl==0.12.11
 Cerberus==1.3.4
 certifi==2022.6.15
 chardet==5.0.0
 charset-normalizer==2.1.1
-codecov==2.1.12
+codecov==2.1.13
 colorama==0.4.4
 contextlib2==21.6.0
 coverage==6.4.4
@@ -51,12 +51,12 @@ python-dateutil==2.8.2
 pytoml==0.1.21
 pytoolconfig==1.2.2
 pytricia==1.0.2
-PyYAML==5.4.1
+PyYAML==6.0.1
 requests==2.28.1
 retrying==1.3.3
 rope==1.3.0
 rsa==4.7.2
-s3transfer==0.6.0
+s3transfer==0.7.0
 six==1.16.0
 sortedcontainers==2.4.0
 thrift==0.16.0

rift/common.thrift

@@ -4,7 +4,6 @@
 
 
 namespace py common
-namespace rs models
 
 /** @note MUST be interpreted in implementation as unsigned 64 bits.
  */
@@ -147,6 +146,14 @@ const MTUSizeType     default_mtu_size           = 1400
 /** default link being BFD capable */
 const bool            bfd_default                = true
 
+/** type used to target nodes with key value */
+typedef i64 KeyValueTargetType
+
+/** default target for key value are all nodes. */
+const KeyValueTargetType    keyvaluetarget_default = 0
+/** value for _all leaves_ addressing. Represented by all bits set. */
+const KeyValueTargetType    keyvaluetarget_all_south_leaves = -1
+
 /** undefined nonce, equivalent to missing nonce */
 const NonceType       undefined_nonce            = 0;
 /** outer security key id, MUST be interpreted as in implementation
@@ -183,21 +190,21 @@ enum AddressFamilyType {
 struct IPv4PrefixType {
     1: required IPv4Address    address;
     2: required PrefixLenType  prefixlen;
-} (python.immutable = "")
+} 
 
 /** IPv6 prefix type. */
 struct IPv6PrefixType {
     1: required IPv6Address    address;
     2: required PrefixLenType  prefixlen;
-} (python.immutable = "")
+} 
 
 /** IP address type. */
 union IPAddressType {
     /** Content is IPv4 */
     1: optional IPv4Address   ipv4address;
     /** Content is IPv6 */
     2: optional IPv6Address   ipv6address;
-} (python.immutable = "")
+} 
 
 /** Prefix advertisement.
 
@@ -210,7 +217,7 @@ union IPAddressType {
 union IPPrefixType {
     1: optional IPv4PrefixType   ipv4prefix;
     2: optional IPv6PrefixType   ipv6prefix;
-} (python.immutable = "")
+} 
 
 /** Sequence of a prefix in case of move.
  */
@@ -272,45 +279,11 @@ enum RouteType {
 }
 
 enum   KVTypes {
-    OUI       = 1,
-    WellKnown = 2,
-}
-
-/** <auto-evpn>
-    EVPN Fabric ID */
-typedef  i16    FabricIDType
-
-const FabricIDType   undefined_fabric_id   = 0
-const FabricIDType   default_fabric_id     = 1
-
-const    bool   default_acting_auto_evpn_dci_when_tof         = false
-
-enum AutoEVPNModel {
-    ERB_VLAN_BUNDLE = 0,
+    Experimental = 1,
+    WellKnown    = 2,
+    OUI          = 3,
 }
 
-const AutoEVPNModel default_autoevpn_model = AutoEVPNModel.ERB_VLAN_BUNDLE
-
-/** </auto-evpn> */
-
-/** <auto-flood-reflection> */
-
-enum AutoFRModel {
-    /** Full Mesh of L1 tunnel shortcuts, only model supported currently with auto FR */
-    TunnelMode      = 0,
-    NoTunnelMode    = 1,
-}
-
-const AutoFRModel default_autofr_model = AutoFRModel.TunnelMode
-
-typedef i32          FloodReflectionClusterIDType
 
-/* maybe used in future for special purposes */
-const FloodReflectionClusterIDType  IllegalClusterID = 0
-const FloodReflectionClusterIDType  DefaultClusterID  = 1
 
-/// preference to become FR, higher is better
-typedef i32          FloodReflectionPreferenceType
 
-const   FloodReflectionPreferenceType MinFloodReflectionPreference = 0
-/** </auto-flood-reflection> */

rift/common/__init__.py

@@ -9,3 +9,4 @@
         delattr(getattr(ttypes, _klass),"__setattr__")
     except (KeyError, AttributeError):
         pass
+