teste

Makefile

@@ -120,11 +120,16 @@ publish: clean
 # Containers based target rules
 #
 
-start: docker-compose-sdn.yml docker-compose.yml
+start_recreate: docker-compose-sdn.yml docker-compose.yml
 	docker-compose up --force-recreate --remove-orphans -d
 	docker-compose --file $< up --force-recreate -d
 
 
+start: docker-compose-sdn.yml docker-compose.yml
+	docker-compose up  -d
+	docker-compose --file $< up  -d
+
+
 stop: docker-compose-sdn.yml docker-compose.yml
 	@docker-compose down --remove-orphans
 
@@ -172,8 +177,8 @@ endif
 
 
 build_img: scripts/docker/Dockerfile
-	docker build -t networkapi:latest --file scripts/docker/Dockerfile .
-	docker build -t networkapi:$(NETAPI_IMAGE_VERSION) --file scripts/docker/Dockerfile .
+	docker build  --platform=linux/x86_64 -t networkapi:latest --file scripts/docker/Dockerfile .
+	docker build  --platform=linux/x86_64 -t networkapi:$(NETAPI_IMAGE_VERSION) --file scripts/docker/Dockerfile .
 
 
 push_img: scripts/docker/push_image.sh

README.md

@@ -31,8 +31,15 @@ It was not created to be and inventory database, so it does not have CMDB functi
 ## Documentation
 [Documentation](http://globonetworkapi.readthedocs.org/)
 
+## Run API
+Run `make build_img && make start` and visit `http://localhost:8000/healthcheck` if running locally.
+
 ## Run Unit Tests
-To run the unit tests just run `make build_img && make start && make test_ci` this instruction will run all the unit tests specified in the `networkapi/tests/__init__.py` file.
+Run `make test_ci`. This command will run all the unit tests specified in the `networkapi/tests/__init__.py` file.
+
+## Create and run migrations
+To create a new migration, just run into app container `cd dbmigrate; db-migrate --new=<MIGRATION_NAME>`. This step will create a enpty migration file, you must write the SQL statement.
+To run a migration, just run into app container `cd dbmigrate; db-migrate`. This command will execute all migrations files not executed until now.
 
 ## How to contribute
 Check this out at

dbmigrate/migrations/20240715173246_fix_fk_list_config_bgp.migration

@@ -0,0 +1,10 @@
+#-*- coding:utf-8 -*-
+SQL_UP = u"""
+ALTER TABLE equipment_list_config_bgp DROP FOREIGN KEY fk_equipment_list_config_bgp_2;
+ALTER TABLE equipment_list_config_bgp ADD CONSTRAINT `fk_equipment_list_config_bgp_2` FOREIGN KEY (`id_list_config_bgp`) REFERENCES `list_config_bgp` (`id`)
+"""
+
+SQL_DOWN = u"""
+ALTER TABLE equipment_list_config_bgp DROP FOREIGN KEY fk_equipment_list_config_bgp_2;
+ALTER TABLE equipment_list_config_bgp ADD CONSTRAINT `fk_equipment_list_config_bgp_2` FOREIGN KEY (`id_list_config_bgp`) REFERENCES `route_map` (`id`)
+"""

docker-compose.yml

@@ -5,14 +5,21 @@ services:
         container_name: netapi_db
         image: mysql:5.7
         platform: linux/x86_64
+        command: --default-authentication-plugin=mysql_native_password
         ports:
-            - "3306:3306"
+            - "33306:3306"
         environment:
-            MYSQL_ALLOW_EMPTY_PASSWORD: 1
+            MYSQL_ROOT_PASSWORD: 'put_your_password_here'
         volumes:
             - netapi_db_vol:/var/lib/mysql
         networks:
             - netapi_net
+        healthcheck:
+            test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1",-p$$MYSQL_ROOT_PASSWORD ,"--silent"]
+            interval: 5s
+            timeout: 3s
+            retries: 2
+            start_period: 15s
 
     queue:
         container_name: netapi_queue
@@ -37,7 +44,7 @@ services:
 
     celery:
         container_name: netapi_celery
-        image: networkapi:latest
+        image: globocom/networkapi:latest
         build:
             context: .
             dockerfile: ./scripts/docker/Dockerfile
@@ -55,11 +62,11 @@ services:
             - queue:netapi_queue
             - cache:netapi_cache
         depends_on:
-          - queue
+            - queue
 
     netapi:
         container_name: netapi_app
-        image: globocom:latest
+        image: globocom/networkapi:latest
         build:
             context: .
             dockerfile: ./scripts/docker/Dockerfile
@@ -79,9 +86,8 @@ services:
         networks:
             - netapi_net
         depends_on:
-            - db
-            - queue
-            - cache
+            db:
+                condition: service_healthy
         links:
             - db:netapi_db
         external_links:
@@ -94,4 +100,4 @@ volumes:
     netapi_db_vol:
 
 networks:
-    netapi_net:
+    netapi_net:

fast_start_test.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-source venv/bin/activate
+source /venv/bin/activate
 
 pip install --no-cache --upgrade pip
 pip install -r requirements_test.txt
@@ -100,7 +100,7 @@ echo "=============== Tests for Network v6 ================="
 python manage.py test networkapi/api_network.tests.v3.unit.networkipv6.async.test_delete.py
 python manage.py test networkapi/api_network.tests.v3.unit.networkipv6.async.test_post.py
 python manage.py test networkapi/api_network.tests.v3.unit.networkipv6.async.test_put.py
-python manage.py test networkapi/api_network.tests.v3.sanity.allocate.test_network_v4.py
+python manage.py test networkapi/api_network.tests.v3.sanity.allocate.test_network_v6.py
 python manage.py test networkapi/api_network.tests.v3.sanity.networkipv6.sync.test_delete.py
 python manage.py test networkapi/api_network.tests.v3.sanity.networkipv6.sync.test_get.py
 python manage.py test networkapi/api_network.tests.v3.sanity.networkipv6.sync.test_post.py

networkapi/ambiente/models.py

@@ -1976,7 +1976,7 @@ def searchNextAvailableCIDR(self, subnets, network_mask=None):
         for idx in range(len(subnets)-1):
             step = int(subnets[idx+1].network_first_ip) - int(subnets[idx].network_last_ip) - 1
             if step >= 2 ** (32-int(network_mask)):
-                subnet = NETADDR(str(NETADDR(subnets[idx].network).next().ip) + "/" + network_mask)
+                subnet = NETADDR(str(NETADDR(subnets[idx].network).next().ip) + "/" + str(network_mask))
                 if subnet.ip == subnet.network and \
                         not ipaddr.IPNetwork(subnet).overlaps(ipaddr.IPNetwork(subnets[idx+1].network)):
                     return str(subnet)
@@ -2000,7 +2000,7 @@ def nextAvailableCIDR(self, subnets, network, network_mask=None):
         elif int(network_mask) == last_subnet.prefixlen:
             subnet = last_subnet.next()
         else:
-            subnet = NETADDR(str(last_subnet.next().ip) + "/" + network_mask)
+            subnet = NETADDR(str(last_subnet.next().ip) + "/" + str(network_mask))
             if not subnet.ip == subnet.network:
                 subnet = subnet.next()
 

networkapi/api_channel/facade.py

@@ -60,6 +60,13 @@ def create(self, data):
         vlan_nativa = data.get('vlan')
         envs_vlans = data.get('envs_vlans')
 
+        ### Verify if channel number is greater than 0 and smaller or equal to 4096
+        if int(nome) > 4096 or int(nome) <=1 :
+            log.error("Channel %s must be between 0 and 4097." % nome)
+            raise InterfaceError(
+                "Channel %s must be between 0 and 4097." % nome
+            )
+
         api_interface_facade.verificar_vlan_nativa(vlan_nativa)
 
         # Checks if Port Channel name already exists on equipment

networkapi/api_deploy/facade.py

@@ -20,7 +20,7 @@
 from networkapi.api_equipment.exceptions import AllEquipmentsAreInMaintenanceException
 from networkapi.api_rest import exceptions as api_exceptions
 from networkapi.distributedlock import distributedlock
-from networkapi.equipamento.models import Equipamento
+from networkapi.equipamento.models import Equipamento, EquipamentoAcesso
 from networkapi.extra_logging import local
 from networkapi.extra_logging import NO_REQUEST_ID
 from networkapi.plugins.factory import PluginFactory
@@ -65,6 +65,11 @@ def _applyconfig(equipment, filename, equipment_access=None, source_server=None,
 
     # TODO: Handle exceptions from the following methods and generate response
     # for the caller
+    # tipo_acesso = EquipamentoAcesso.search(None,
+    #                                     equipment,
+    #                                     ).uniqueResult()
+    # if tipo_acesso is None:
+    #     return 'Equipment has no Access.'
 
     equip_plugin = PluginFactory.factory(equipment)
     equip_plugin.connect()

networkapi/api_equipment/exceptions.py

@@ -7,8 +7,8 @@ class AllEquipmentsAreInMaintenanceException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
     default_detail = 'All equipments to be configured are in maintenance mode.'
 
-    def __init__(self, param=default_detail):
-        self.detail = param
+    def __init__(self, param=default_detail, equips=None):
+        self.detail = param if not equips else "{} Equipments: {}".format(param, equips)
 
 
 class EquipmentInvalidValueException(APIException):

networkapi/api_interface/facade.py

@@ -290,13 +290,21 @@ def get_interface_by_ids(interface_ids):
 
 
 def generate_delete_file(user, equip_id, interface_list, channel):
+
+    log.info("generate_delete_file equip_id:%s interface_list:%s channel:%s", equip_id, interface_list, channel)
+
     try:
         INTERFACE_CONFIG_TOAPPLY_REL_PATH = get_variable(
             'interface_config_toapply_rel_path')
         INTERFACE_CONFIG_FILES_PATH = get_variable(
             'interface_config_files_path')
         TEMPLATE_REMOVE_CHANNEL = get_variable('template_remove_channel')
         TEMPLATE_REMOVE_INTERFACE = get_variable('template_remove_interface')
+
+        log.debug('INTERFACE_CONFIG_TOAPPLY_REL_PATH:%s', INTERFACE_CONFIG_TOAPPLY_REL_PATH)
+        log.debug('INTERFACE_CONFIG_FILES_PATH:%s', INTERFACE_CONFIG_FILES_PATH)
+        log.debug('TEMPLATE_REMOVE_CHANNEL:%s', TEMPLATE_REMOVE_CHANNEL)
+        log.debug('TEMPLATE_REMOVE_INTERFACE:%s', TEMPLATE_REMOVE_INTERFACE)
     except ObjectDoesNotExist:
         raise var_exceptions.VariableDoesNotExistException(
             'Erro buscando a variável INTERFACE_CONFIG_TEMPLATE_PATH,'
@@ -350,9 +358,12 @@ def generate_delete_file(user, equip_id, interface_list, channel):
 
 def delete_channel(user, equip_id, interface_list, channel):
 
+    log.info('delete_channel equip_id:%s interface_list:%s channel:%s', equip_id, interface_list, channel)
+
     file_to_deploy = generate_delete_file(
         user, equip_id, interface_list, channel)
 
+    log.debug('file_to_deploy: %s', file_to_deploy)
     # TODO Deploy config file
     try:
         lockvar = LOCK_EQUIPMENT % (equip_id)
@@ -510,6 +521,7 @@ def _load_template_file(equipment_id, template_type):
 
     filename_in = INTERFACE_CONFIG_TEMPLATE_PATH + \
         equipment_template.roteiro.roteiro
+    log.debug("filename_in: %s", filename_in)
 
     # Read contents from file
     try:

networkapi/api_interface/views.py

@@ -41,6 +41,7 @@
 from networkapi.util.decorators import prepare_search
 from networkapi.util.json_validate import json_validate
 from networkapi.util.json_validate import raise_json_validate
+from networkapi.util.interface_validate import InterfaceOverrideValidator
 from networkapi.util.geral import create_lock
 from networkapi.util.geral import destroy_lock
 from networkapi.util.geral import render_to_json
@@ -327,6 +328,10 @@ class InterfaceV3View(CustomAPIView):
     def get(self, request, *args, **kwargs):
         """URL: api/v3/interface/"""
 
+        log.info('InterfaceV3View GET')
+        log.info('kwargs: %s', kwargs)
+        log.info('search: %s', self.search)
+
         if not kwargs.get('obj_ids'):
             obj_model = facade.get_interface_by_search(self.search)
             interfaces = obj_model['query_set']
@@ -354,6 +359,8 @@ def get(self, request, *args, **kwargs):
             only_main_property=only_main_property
         )
 
+        log.info('get interfaces response: %s', data)
+
         return Response(data, status=status.HTTP_200_OK)
 
     @logs_method_apiview
@@ -369,8 +376,36 @@ def post(self, request, *args, **kwargs):
         response = list()
 
         interfaces = request.DATA
+        log.info('InterfaceV3View POST')
+        log.info('interfaces: %s', interfaces)
+        log.info('kwargs: %s', kwargs)
         json_validate(SPECS.get('interface_post')).validate(interfaces)
 
+        user_interface_str_list = []
+        equipmemnt_interface_str_list = []
+        for interface in interfaces.get('interfaces'):
+
+            # User interface input, ex.: 
+            # ex.: eth1, eth1/1, 1, Gi1/5, FF:FF:FF:FF:FF:F, int1, mgmt0, ethernet1/12, ..
+            interface_input = interface['interface']
+            user_interface_str_list.append(interface_input)
+
+            # Equipments from input interface
+            equipment_id = interface['equipment']
+            obj_model = facade.get_interface_by_search(
+                {'extends_search': [], 'start_record': 0, 'custom_search': equipment_id, 'end_record': 1000, 'asorting_cols': ['id'], 'searchable_columns': ['equipamento__id']}
+            )
+            equipment_list = obj_model['query_set']
+            log.debug("equipment_list %s", equipment_list)
+            for equipment_interface in equipment_list:
+                equipmemnt_interface_str_list.append(equipment_interface.interface)
+
+        # Validate interface overrinding
+        InterfaceOverrideValidator().check_overriding(
+            source_interface_str_list=user_interface_str_list,
+            target_interface_str_list=equipmemnt_interface_str_list
+        )
+
         for i in interfaces.get('interfaces'):
             try:
                 interface = facade.create_interface(i)

networkapi/api_neighbor/models.py

@@ -271,10 +271,12 @@ def deploy(self):
                 list_config_bgp=entry.list_config_bgp
             )
             if not eqpt_list_config:
-                EquipmentListConfig().create_v4({
-                    'equipment': equipment.id,
-                    'list_config_bgp': entry.list_config_bgp.id
-                })
+                self.log.debug('equipment id %s' % equipment.id)
+                self.log.debug('id_list_config_bgp %s' % entry.list_config_bgp.id)
+                # EquipmentListConfig().create_v4({
+                #     'equipment': equipment.id,
+                #     'list_config_bgp': entry.list_config_bgp.id
+                # })
 
     def undeploy(self):
         """Undeploy NeighborV4."""

networkapi/api_neighbor/v4/exceptions.py

@@ -123,27 +123,29 @@ class RemoteIpAndRemoteAsnAtDifferentEquipmentsException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
 
     def __init__(self, neighbor):
-        self.detail = u'RemoteIp id = {} and RemoteAsn id = {} belongs to ' \
-                      u'different Equipments'.\
-            format(neighbor.remote_ip, neighbor.remote_asn)
+        # self.detail = u'RemoteIp id = {} and RemoteAsn id = {} belongs to ' \
+        #               u'different Equipments'.\
+        #     format(neighbor.remote_ip, neighbor.remote_asn)
+        self.detail =  u'O ASN remoto (id: {}) não está associado a qualquer equipamento do IP (id: {}). '.\
+            format(neighbor.remote_asn, neighbor.remote_ip)
 
 
 class LocalIpAndPeerGroupAtDifferentEnvironmentsException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
 
     def __init__(self, neighbor):
-        self.detail = u'LocalIp id = {} and PeerGroup id = {} belongs to ' \
-                      u'different Environments'. \
-            format(neighbor.local_ip, neighbor.peer_group)
+        self.detail = u'Not allowed to configure BGP neighbor using this Peer Group. ' \
+                      u'PeerGroup id = {} is not mapped to the environment of LocalIp id = {}'.\
+            format(neighbor.peer_group, neighbor.local_ip)
 
 
 class NeighborDuplicatedException(APIException):
     status_code = status.HTTP_400_BAD_REQUEST
 
     def __init__(self, neighbor):
-        self.detail = u'It already exists Neighbor with LocalAsn id = {}, ' \
+        self.detail = u'Duplicated neighbor. A Neighbor with LocalAsn id = {}, ' \
                       u'LocalIp id = {}, RemoteAsn id = {} and ' \
-                      u'RemoteIp id = {}'.\
+                      u'RemoteIp id = {} already exists'.\
             format(neighbor.local_asn, neighbor.local_ip,
                    neighbor.remote_asn, neighbor.remote_ip)
 

networkapi/api_rack/autoprovision.py

@@ -509,8 +509,16 @@ def autoprovision_splf(rack, equips):
                 variablestochangespine1["VLANBORDACACHOSLEAF"] = str(VLANBORDACACHOSLEAF[numero_rack][spine_num-1])
                 variablestochangespine1["VLANBORDACACHOSBLEAF"] = str(VLANBORDACACHOSBLEAF[numero_rack][spine_num-1])
                 variablestochangespine1["ASLEAF"] = str(ASLEAF[numero_rack][0])
+
+                ### To pop Berrini
+                variablestochangespine1["IPNEIGHLEAF2IPV4"] = str(IPLEAFipv4[numero_rack][spine_num])
+                variablestochangespine1["IPNEIGHLEAF2IPV6"] = str(IPLEAFipv6[numero_rack][spine_num])
+
+
                 variablestochangespine1["IPNEIGHLEAFIPV4"] = str(IPLEAFipv4[numero_rack][spine_num-1])
                 variablestochangespine1["IPNEIGHLEAFIPV6"] = str(IPLEAFipv6[numero_rack][spine_num-1])
+
+                variablestochangespine1["RACK_NUM"] = str(numero_rack)
                 if spine_num in [1, 3]:
                     variablestochangeleaf1["SP1_HOSTNAME"] = i.get("nome")
                     variablestochangeleaf1["INTERFACE_SP1"] = i.get("interface")

networkapi/api_rack/facade.py

@@ -970,8 +970,8 @@ def allocate_env_vlan(user, rack_id):
     rack_env.spine_leaf_vlans_save()
 
     # leaf x leaf
-    rack_env.leaf_leaf_vlans_save()
     rack_env.leaf_leaf_envs_save()
+    rack_env.leaf_leaf_vlans_save()
 
     # producao/cloud
     rack_env.prod_environment_save()