Merge pull request #112 from stfc/further_changes

Change default rack height to 0
stfc · Oct 30, 2023 · 1a5908a · 1a5908a
2 parents 1c70fb3 + dd41ee4
commit 1a5908a
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 35 deletions.
diff --git a/.github/workflows/Pynetbox.yaml → .github/workflows/pynetbox.yaml b/.github/workflows/Pynetbox.yaml → .github/workflows/pynetbox.yaml
@@ -6,15 +6,15 @@ on:
       - master
   pull_request:
     paths:
-      - "Pynetbox_Data_Uploader/**"
-      - ".github/workflows/Pynetbox.yaml"
+      - "pynetbox_data_uploader/**"
+      - ".github/workflows/pynetbox.yaml"
 
 jobs:
   test_and_lint:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.x"]
+        python-version: ["3.8", "3.x"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -26,20 +26,18 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r Pynetbox_Data_Uploader/requirements.txt
-
-      - name: Run tests
-        run: cd Pynetbox_Data_Uploader && python3 -m pytest .
+          cd pynetbox_data_uploader
+          pip install -r requirements.txt
+          
 
       - name: Analyse with pylint
-        run: |
-         cd Pynetbox_Data_Uploader && pylint $(git ls-files '*.py') --rcfile=.pylintrc
+        run: cd pynetbox_data_uploader && pylint . --rcfile=.pylintrc
 
       - name: Run tests and collect coverage
-        run: cd Pynetbox_Data_Uploader && python3 -m pytest --cov-report xml:coverage.xml --cov
+        run: cd pynetbox_data_uploader && python3 -m pytest --cov-report xml:coverage.xml --cov
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          files: ./Pynetbox_Data_Uploader/coverage.xml
+          files: ./pynetbox_data_uploader/coverage.xml
 
diff --git a/Pynetbox_Data_Uploader/setup.py b/Pynetbox_Data_Uploader/setup.py
diff --git a/Pynetbox_Data_Uploader/.pylintrc → pynetbox_data_uploader/.pylintrc b/Pynetbox_Data_Uploader/.pylintrc → pynetbox_data_uploader/.pylintrc
diff --git a/Pynetbox_Data_Uploader/lib/__init__.py → pynetbox_data_uploader/__init__.py b/Pynetbox_Data_Uploader/lib/__init__.py → pynetbox_data_uploader/__init__.py
diff --git a/Pynetbox_Data_Uploader/lib/enums/__init__.py → pynetbox_data_uploader/lib/__init__.py b/Pynetbox_Data_Uploader/lib/enums/__init__.py → pynetbox_data_uploader/lib/__init__.py
diff --git a/..._Data_Uploader/lib/netbox_api/__init__.py → pynetbox_data_uploader/lib/enums/__init__.py b/..._Data_Uploader/lib/netbox_api/__init__.py → pynetbox_data_uploader/lib/enums/__init__.py
diff --git a/...Data_Uploader/lib/enums/dcim_device_id.py → ...data_uploader/lib/enums/dcim_device_id.py b/...Data_Uploader/lib/enums/dcim_device_id.py → ...data_uploader/lib/enums/dcim_device_id.py
diff --git a/...a_Uploader/lib/enums/dcim_device_no_id.py → ...a_uploader/lib/enums/dcim_device_no_id.py b/...a_Uploader/lib/enums/dcim_device_no_id.py → ...a_uploader/lib/enums/dcim_device_no_id.py
diff --git a/...ata_Uploader/lib/user_methods/__init__.py → ..._data_uploader/lib/netbox_api/__init__.py b/...ata_Uploader/lib/user_methods/__init__.py → ..._data_uploader/lib/netbox_api/__init__.py
diff --git a/...a_Uploader/lib/netbox_api/netbox_check.py → ...a_uploader/lib/netbox_api/netbox_check.py b/...a_Uploader/lib/netbox_api/netbox_check.py → ...a_uploader/lib/netbox_api/netbox_check.py
diff --git a/...Uploader/lib/netbox_api/netbox_connect.py → ...uploader/lib/netbox_api/netbox_connect.py b/...Uploader/lib/netbox_api/netbox_connect.py → ...uploader/lib/netbox_api/netbox_connect.py
diff --git a/..._Uploader/lib/netbox_api/netbox_create.py → ..._uploader/lib/netbox_api/netbox_create.py b/..._Uploader/lib/netbox_api/netbox_create.py → ..._uploader/lib/netbox_api/netbox_create.py
@@ -7,6 +7,10 @@ class NetboxCreate:
     """
 
     def __init__(self, api):
+        """
+        This initialises the method with the api object.
+        :param api:
+        """
         self.netbox = api
 
     def create_device(self, data: Union[Dict, List]) -> bool:
@@ -19,14 +23,14 @@ def create_device(self, data: Union[Dict, List]) -> bool:
         return bool(devices)
 
     def create_device_type(
-        self, model: str, slug: str, manufacturer: str, u_height: int = 1
+        self, model: str, slug: str, manufacturer: str, u_height: int = 0
     ) -> bool:
         """
         This method creates a new device type in Netbox.
         :param model: The model name of the device.
         :param slug: The URL friendly version of the model name.
         :param manufacturer: The manufacturer of the device.
-        :param u_height: This it the height of the device in the rack. Default 1.
+        :param u_height: This is the height of the device in the rack. Default 0.
         :return: Returns bool.
         """
         device_type = self.netbox.dcim.device_types.create(

diff --git a/...ta_Uploader/lib/netbox_api/netbox_data.py → ...ta_uploader/lib/netbox_api/netbox_data.py b/...ta_Uploader/lib/netbox_api/netbox_data.py → ...ta_uploader/lib/netbox_api/netbox_data.py
diff --git a/Pynetbox_Data_Uploader/lib/utils/__init__.py → ...ata_uploader/lib/user_methods/__init__.py b/Pynetbox_Data_Uploader/lib/utils/__init__.py → ...ata_uploader/lib/user_methods/__init__.py
diff --git a/...ploader/lib/user_methods/csv_to_netbox.py → ...ploader/lib/user_methods/csv_to_netbox.py b/...ploader/lib/user_methods/csv_to_netbox.py → ...ploader/lib/user_methods/csv_to_netbox.py
diff --git a/Pynetbox_Data_Uploader/tests/__init__.py → pynetbox_data_uploader/lib/utils/__init__.py b/Pynetbox_Data_Uploader/tests/__init__.py → pynetbox_data_uploader/lib/utils/__init__.py
diff --git a/...ox_Data_Uploader/lib/utils/format_dict.py → ...ox_data_uploader/lib/utils/format_dict.py b/...ox_Data_Uploader/lib/utils/format_dict.py → ...ox_data_uploader/lib/utils/format_dict.py
diff --git a/Pynetbox_Data_Uploader/pytest.ini → pynetbox_data_uploader/pytest.ini b/Pynetbox_Data_Uploader/pytest.ini → pynetbox_data_uploader/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 pythonpath = lib
-testpaths = Tests
+testpaths = tests
 python_files = *.py
 python_functions = test_*
 addopts = --ignore=setup.py
diff --git a/Pynetbox_Data_Uploader/requirements.txt → pynetbox_data_uploader/requirements.txt b/Pynetbox_Data_Uploader/requirements.txt → pynetbox_data_uploader/requirements.txt
diff --git a/pynetbox_data_uploader/tests/__init__.py b/pynetbox_data_uploader/tests/__init__.py
diff --git a/...x_Data_Uploader/tests/test_csv_to_dict.py → ...x_data_uploader/tests/test_csv_to_dict.py b/...x_Data_Uploader/tests/test_csv_to_dict.py → ...x_data_uploader/tests/test_csv_to_dict.py
diff --git a/..._Data_Uploader/tests/test_netbox_check.py → ..._data_uploader/tests/test_netbox_check.py b/..._Data_Uploader/tests/test_netbox_check.py → ..._data_uploader/tests/test_netbox_check.py
diff --git a/...ata_Uploader/tests/test_netbox_connect.py → ...ata_uploader/tests/test_netbox_connect.py b/...ata_Uploader/tests/test_netbox_connect.py → ...ata_uploader/tests/test_netbox_connect.py
diff --git a/...Data_Uploader/tests/test_netbox_create.py → ...data_uploader/tests/test_netbox_create.py b/...Data_Uploader/tests/test_netbox_create.py → ...data_uploader/tests/test_netbox_create.py
@@ -37,5 +37,5 @@ def test_create_device_type(instance):
         model=mock_model, manufacturer=mock_manufacturer, slug=mock_slug
     )
     mock_device_types.create.assert_called_once_with(
-        model=mock_model, slug=mock_slug, manufacturer=mock_manufacturer, u_height=1
+        model=mock_model, slug=mock_slug, manufacturer=mock_manufacturer, u_height=0
     )
diff --git a/...x_Data_Uploader/tests/test_netbox_data.py → ...x_data_uploader/tests/test_netbox_data.py b/...x_Data_Uploader/tests/test_netbox_data.py → ...x_data_uploader/tests/test_netbox_data.py