Merge pull request #380 from globocom/develop

Develop
globocom · May 23, 2023 · ab81a0f · ab81a0f
2 parents fd23776 + 7eb01bb
commit ab81a0f
Show file tree

Hide file tree

Showing 57 changed files with 1,542 additions and 1,121 deletions.
diff --git a/fast_start_test.sh b/fast_start_test.sh
@@ -160,3 +160,14 @@ python manage.py test networkapi/api_vip_request.tests.sanity.sync.test_put.py
 python manage.py test networkapi/api_vip_request.tests.unit.async.test_delete.py
 python manage.py test networkapi/api_vip_request.tests.unit.async.test_post.py
 python manage.py test networkapi/api_vip_request.tests.unit.async.test_put.py
+
+# echo ""
+echo "=============== Tests for Neighbor ================="
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v4.sanity.sync.test_delete.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v4.sanity.sync.test_get.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v4.sanity.sync.test_post.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v4.sanity.sync.test_put.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v6.sanity.sync.test_delete.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v6.sanity.sync.test_get.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v6.sanity.sync.test_post.py
+python manage.py test networkapi/api_neighbor.v4.tests.neighbor_v6.sanity.sync.test_put.py
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_asn.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_asn.json
@@ -54,5 +54,13 @@
     },
     "model": "api_asn.Asn",
     "pk": 7
+  },
+  {
+    "fields": {
+      "description": "ASN 8",
+      "name": "8"
+    },
+    "model": "api_asn.Asn",
+    "pk": 8
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_asn_equipment.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_asn_equipment.json
@@ -30,5 +30,13 @@
     },
     "model": "api_asn.asnequipment",
     "pk": 3
+  },
+  {
+    "fields": {
+      "asn": 8,
+      "equipment": 5
+    },
+    "model": "api_asn.asnequipment",
+    "pk": 4
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_environment_peer_group.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_environment_peer_group.json
@@ -14,5 +14,13 @@
     },
     "model": "api_peer_group.EnvironmentPeerGroup",
     "pk": 2
+  },
+  {
+    "fields": {
+      "environment": 1,
+      "peer_group": 4
+    },
+    "model": "api_peer_group.EnvironmentPeerGroup",
+    "pk": 3
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_equipment.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_equipment.json
@@ -60,5 +60,15 @@
     },
     "model": "equipamento.equipamento",
     "pk": 4
+  },
+  {
+    "fields": {
+      "maintenance": false,
+      "modelo": 1,
+      "nome": "EQUIPMENT-5",
+      "tipo_equipamento": 1
+    },
+    "model": "equipamento.equipamento",
+    "pk": 5
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_ipv4.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_ipv4.json
@@ -86,5 +86,16 @@
     },
     "model": "ip.ip",
     "pk": 8
+  },
+  {
+    "fields": {
+      "networkipv4": 5,
+      "oct1": 192,
+      "oct2": 168,
+      "oct3": 2,
+      "oct4": 3
+    },
+    "model": "ip.ip",
+    "pk": 9
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_ipv4_equipment.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_ipv4_equipment.json
@@ -38,5 +38,13 @@
     },
     "model": "ip.ipequipamento",
     "pk": 5
+  },
+  {
+    "fields": {
+      "equipamento": 5,
+      "ip": 9
+    },
+    "model": "ip.ipequipamento",
+    "pk": 6
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_neighbor_v4.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_neighbor_v4.json
@@ -4,7 +4,7 @@
       "created": false,
       "local_asn": 1,
       "local_ip": 1,
-      "peer_group": 1,
+      "peer_group": 2,
       "remote_asn": 2,
       "remote_ip": 2,
       "virtual_interface": "test_vi"
@@ -24,5 +24,74 @@
     },
     "model": "api_neighbor.NeighborV4",
     "pk": 2
+  },
+  {
+    "fields": {
+      "name": "peer_group_1",
+      "route_map_in": 1,
+      "route_map_out": 2
+    },
+    "model": "api_peer_group.PeerGroup",
+    "pk": 1
+  },
+  {
+    "fields": {
+      "name": "peer_group_2",
+      "route_map_in": 3,
+      "route_map_out": 4
+    },
+    "model": "api_peer_group.PeerGroup",
+    "pk": 2
+  },
+  {
+    "fields": {
+      "name": "peer_group_3",
+      "route_map_in": 5,
+      "route_map_out": 6
+    },
+    "model": "api_peer_group.PeerGroup",
+    "pk": 3
+  },
+  {
+    "fields": {
+      "name": "route_map_1"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 1
+  },
+  {
+    "fields": {
+      "name": "route_map_2"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 2
+  },
+  {
+    "fields": {
+      "name": "route_map_3"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 3
+  },
+  {
+    "fields": {
+      "name": "route_map_4"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 4
+  },
+  {
+    "fields": {
+      "name": "route_map_5"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 5
+  },
+  {
+    "fields": {
+      "name": "route_map_6"
+    },
+    "model": "api_route_map.RouteMap",
+    "pk": 6
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_networkipv4.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_networkipv4.json
@@ -89,5 +89,26 @@
     },
     "model": "ip.networkipv4",
     "pk": 4
+  },
+  {
+    "fields": {
+      "active": true,
+      "ambient_vip": null,
+      "block": 24,
+      "broadcast": "192.168.4.255",
+      "cluster_unit": "",
+      "mask_oct1": 255,
+      "mask_oct2": 255,
+      "mask_oct3": 255,
+      "mask_oct4": 0,
+      "network_type": 1,
+      "oct1": 192,
+      "oct2": 168,
+      "oct3": 4,
+      "oct4": 0,
+      "vlan": 5
+    },
+    "model": "ip.networkipv4",
+    "pk": 5
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_peer_group.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_peer_group.json
@@ -25,5 +25,14 @@
     },
     "model": "api_peer_group.PeerGroup",
     "pk": 3
+  },
+  {
+    "fields": {
+      "name": "peer_group_4",
+      "route_map_in": 5,
+      "route_map_out": 6
+    },
+    "model": "api_peer_group.PeerGroup",
+    "pk": 4
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_vlan.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v4/initial_vlan.json
@@ -34,5 +34,14 @@
     },
     "model": "vlan.vlan",
     "pk": 4
+  },
+  {
+    "fields": {
+      "ambiente": 2,
+      "nome": "VLAN 5 of env 2",
+      "num_vlan": 5
+    },
+    "model": "vlan.vlan",
+    "pk": 5
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v6/initial_ipv6.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v6/initial_ipv6.json
@@ -118,5 +118,20 @@
     },
     "model": "ip.ipv6",
     "pk": 8
+  },
+  {
+    "fields": {
+      "block1": "fc01",
+      "block2": "0000",
+      "block3": "0000",
+      "block4": "0002",
+      "block5": "0000",
+      "block6": "0000",
+      "block7": "0000",
+      "block8": "0003",
+      "networkipv6": 2
+    },
+    "model": "ip.ipv6",
+    "pk": 9
   }
 ]
diff --git a/networkapi/api_neighbor/v4/fixtures/neighbor_v6/initial_ipv6_equipment.json b/networkapi/api_neighbor/v4/fixtures/neighbor_v6/initial_ipv6_equipment.json
@@ -39,4 +39,13 @@
     "model": "ip.ipv6equipament",
     "pk": 5
   }
+  ,
+  {
+    "fields": {
+      "equipamento": 4,
+      "ip": 9
+    },
+    "model": "ip.ipv6equipament",
+    "pk": 6
+  }
 ]