add more account attributes

Author: dmitry-sinina

yeti_switch_api/orm/customers_auth.py

@@ -21,6 +21,9 @@ class Meta:
     dst_prefix = AttributeField("dst-prefix")
     x_yeti_auth = AttributeField("x-yeti-auth")
 
+    tag_action = RelationField("tag-action")
+    tag_action_value = AttributeField("tag-action-value")
+
     def creatable_fields(self):
         return [
             "name",
@@ -37,4 +40,9 @@ def creatable_fields(self):
             "src-prefix",
             "dst-prefix",
             "x-yeti-auth",
+            "tag-action",
+            "tag-action-value"
         ]
+
+    def updatable_fields(self):
+        return self.creatable_fields()

yeti_switch_api/orm/numberlist.py

@@ -7,6 +7,47 @@ class Meta:
         type = "numberlists"
 
     name = AttributeField("name")
-    default_action_id = AttributeField("action-id")
+    default_action = AttributeField("default-action-id")
     DEFAULT_ACTION_REJECT = 1
     DEFAULT_ACTION_ACCEPT = 2
+
+    mode = AttributeField("mode-id")
+    MODE_STRICT = 1
+    MODE_PREFIX = 2
+    MODE_RANDOM = 3
+
+    default_src_rewrite_rule = AttributeField("default-src-rewrite-rule")
+    default_src_rewrite_result = AttributeField("default-src-rewrite-result")
+    defer_src_rewrite = AttributeField("defer-src-rewrite")
+    default_dst_rewrite_rule = AttributeField("default-dst-rewrite-rule")
+    default_dst_rewrite_result = AttributeField("default-dst-rewrite-result")
+    defer_dst_rewrite = AttributeField("defer-dst-rewrite")
+
+    external_id = AttributeField("external-id")
+    external_type = AttributeField("external-type")
+
+    tag_action = RelationField("tag-action")
+    tag_action_value = AttributeField("tag-action-value")
+
+    created_at = AttributeField("created-at")
+    updated_at = AttributeField("updated-at")
+
+    def creatable_fields(self):
+        return [
+            "name"
+            "default-action-id",
+            "tag-action",
+            "tag-action-value",
+            "mode-id",
+            "default-src-rewrite-rule",
+            "default-src-rewrite-result",
+            "defer-src-rewrite",
+            "default-dst-rewrite-rule",
+            "default-dst-rewrite-result",
+            "defer-dst-rewrite",
+            "external-id",
+            "external-type"
+        ]
+
+    def updatable_fields(self):
+        return self.creatable_fields()

yeti_switch_api/orm/numberlist_item.py

@@ -6,16 +6,44 @@ class Meta:
         path = "numberlist-items"
         type = "numberlist-items"
 
-    key = AttributeField("key")
-    number_min_length = AttributeField("number_min_length")
-    number_max_length = AttributeField("number_max_length")
-    src_rewrite_rule = AttributeField("src_rewrite_rule")
-    src_rewrite_result = AttributeField("src_rewrite_result")
-    dst_rewrite_rule = AttributeField("dst_rewrite_rule")
-    dst_rewrite_result = AttributeField("dst_rewrite_result")
-    created_at = AttributeField("created_at")
-    updated_at = AttributeField("updated_at")
     numberlist = RelationField("numberlist")
+    key = AttributeField("key")
+    number_min_length = AttributeField("number-min-length")
+    number_max_length = AttributeField("number-max-length")
+    src_rewrite_rule = AttributeField("src-rewrite-rule")
+    src_rewrite_result = AttributeField("src-rewrite-result")
+    defer_src_rewrite = AttributeField("defer-src-rewrite")
+
+    dst_rewrite_rule = AttributeField("dst-rewrite-rule")
+    dst_rewrite_result = AttributeField("dst-rewrite-result")
+    defer_dst_rewrite = AttributeField("defer-dst-rewrite")
+
+    created_at = AttributeField("created-at")
+    updated_at = AttributeField("updated-at")
+
     action_id = AttributeField("action-id")
     ACTION_REJECT = 1
     ACTION_ACCEPT = 2
+
+    tag_action = RelationField("tag-action")
+    tag_action_value = AttributeField("tag-action-value")
+
+    def creatable_fields(self):
+        return [
+            "numberlist"
+            "key",
+            "number-min-length",
+            "number-max-length",
+            "src-rewrite-rule",
+            "src-rewrite-result",
+            "defer-src-rewrite"
+            "dst-rewrite-rule",
+            "dst-rewrite-result",
+            "defer-dst-rewrite",
+            "action-id",
+            "tag-action",
+            "tag-action-value"
+        ]
+
+    def updatable_fields(self):
+        return self.creatable_fields()