Commit Graph

147 Commits

Author SHA1 Message Date
Hans 6eedef4137 fix bug when method is DELETE 2020-09-20 21:44:22 +08:00
Hans 29cf4c48cd extent name replace / to - 2020-09-20 16:23:57 +08:00
Hans 401bcfce53 Support for TrueNAS SCALE version pattern 2020-09-20 15:08:32 +08:00
Kevin Scott Adams e1657ca395
Merge pull request #73 from TheGrandWazoo/master
Fix issue with JSON variable names in V1.0 api
2020-09-10 15:47:00 -04:00
Kevin Scott Adams c9ecef474b Fix issue with JSON variable names in V1.0 api
- JSON return variables for V1.0 api are iscsi_extent and iscsi_target.
The 'id' was a copy and paste error.

Fixes #72
2020-09-10 15:36:41 -04:00
Kevin Scott Adams 324b893a7f
Merge pull request #70 from TheGrandWazoo/master
Update branch 2.0
2020-09-02 16:44:44 -04:00
Kevin Scott Adams 7c0738bab4 Added a space to kick off a build.
- Checking the build of branch 2.0.
2020-09-02 16:37:24 -04:00
Kevin Scott Adams 3dd67fbf57 Trying GitVersioning
- See if I can make a version number on builds using a premade action.
2020-09-01 21:16:11 -04:00
Kevin Scott Adams a6e9229677 New build process
- Testing the github actions to build the debian package.
2020-08-28 15:22:01 -04:00
Kevin Scott Adams cad1ef6d44
Merge pull request #67 from TheGrandWazoo/add-license-1
Create LICENSE
2020-08-27 15:19:41 -04:00
Kevin Scott Adams 06da4b488a
Create LICENSE 2020-08-27 15:16:14 -04:00
Kevin Scott Adams 13a93e653b
Update FUNDING.yml 2020-08-27 15:10:14 -04:00
Kevin Scott Adams e43ad9a94f
Update FUNDING.yml 2020-08-27 15:06:04 -04:00
Kevin Scott Adams 3f82fd8782
Delete FUNDING.yml 2020-08-27 15:05:27 -04:00
Kevin Scott Adams 40c0dcff93
Update FUNDING.yml 2020-08-27 14:00:02 -04:00
Kevin Scott Adams 1356c4fad9
Update FUNDING.yml 2020-08-27 13:57:51 -04:00
Kevin Scott Adams 37e1da70aa
Update FUNDING.yml 2020-08-27 13:54:51 -04:00
Kevin Scott Adams 4c8564908e
Update FUNDING.yml 2020-08-27 13:53:15 -04:00
Kevin Scott Adams c23f037ab6
Create FUNDING.yml 2020-08-27 13:47:03 -04:00
Kevin Scott Adams 1570f3cb60
Create FUNDING.yml 2020-08-27 13:46:54 -04:00
Kevin Scott Adams a11d7de0c3
Merge pull request #66 from TheGrandWazoo/master
Rework the error routine so it will not error out.
2020-08-27 13:33:31 -04:00
Kevin Scott Adams a40e0ac299 Rework the error routine so it will not error out.
- Under a certain condition, the variable $freenas_rest_connection would
not be defined resulting in a perl ‘blessed’ error. Added logic to see
if a variable is being passed in the @_ and use it, else use
$freenas_rest_connection.
- Use caller (1)[3] instead of passing the function name through the @_.
2020-08-27 13:05:56 -04:00
Kevin Scott Adams 739b6fb0f6 Update README.md
- Added Martin and sorted
2020-07-30 14:51:41 -04:00
Kevin Scott Adams 91c192f349 Reduce loop from running through all elements
- Just addign a 'last' statement once an extent is found. No since
looking for more after the extent is found because there is no more.
Should make plugin run a bit faster.
2020-07-30 14:22:22 -04:00
Kevin Scott Adams 11dc7e78bd
Merge pull request #64 from tl8roy/patch-1
Update the Readme to more accurately reflect the donation
2020-07-28 08:34:40 -04:00
Tristan Lostroh 2cd8ac2a1d
Update the Readme to more accurately reflect the donation 2020-07-28 15:18:08 +10:00
Kevin Scott Adams b4a9cd27ea Cleanup of code created issue for some calls to run_lun_command
- When cleaning up code from last commit, I removed a line from the
run_lun_command that initialize the code thinking that the way it would
work would be throught the freenas_api_check when calling the
freenas_api_call. Well certain procedures from the Proxmox ZFSPlugin
call procedures that do not have the $freenas_api_methods variable set
yet because freenas_api_check has NOT been called yet. Inserted the
freenas_api_check() in the run_lun_command() to get the variable
initialized. Fixes #62 and other tests that I found to have this issue.
freenas-proxmox-2.0.0-0beta4 will also have the fix.
2020-07-20 09:59:52 -04:00
Kevin Scott Adams 3e128e673c Allow multiple instances of the [Free|True}NAS REST::Client construct.
- When optimizing the code to remove the redundant calls to create a
'new' REST::Client this had a single variable to hold the instance. If
you were moving between two different servers then the variables would
not match the destination parameters of the [Free|True]NAS server.
Implemented a hashref of the construct of REST:Client with the hashref
being the IP address of the portal or API IP. Fixes #61.
- Remove some white spacing and superfluous code.
- Added some comments so I know what I was changing.
2020-07-14 17:54:37 -04:00
Kevin Scott Adams c3935785c0 Update comments/doc of the methods changes
- Just a change to two doc of 'GET' and 'DELETE' method subs.
2020-07-14 17:32:53 -04:00
Kevin Scott Adams ac1c31f2d0 Added 302 and 307 code handlers on initial API connection and various
other changes.

- Add logic to freenas_api_connect to handle a '302 Found' which seems
to mean it does not handle v1.0 API's. Fixes #60.
- Add logic to freenas_api_connect to handle a '307 Temporary Redirect'
which is when the redirect http to https box is checked. Fixes #59.
- Redesign the RegEx that validates and pulls the version information
from the API system/version call. This is due to a format like
TrueNAS-12.0-BETA instead of [FreeNAS|TrueNAS]-12.0-U1.1. Also make sure
empty RegEx return variables are zero (0) so the version number that is
formulated is correct (e.g. 12000000, 11030302). Fixes #60.
- During testing needed to add a check due to the
api/v2.0/system/version returning a quoted string where
api/v1.0/system/version returned a JSON-format data.
- Tested against baremetal FreeNAS 11.3-U3.2 and virtual TrueNAS
12.0-BETA machines.
2020-07-07 11:14:30 -04:00
Kevin Scott Adams aa11d596bd Code efficiency improvements.
- Cleaned up the API calling routine so it will only create one instance
of the REST::Client module. Typically was 10 to 30+ instances per VM
disk CRUD.
- Due to this some variables needed to be “global” to the plugin.
- Removed some superfluous hashes and variables.
- Repetitive code reduced to only on call.
- Created one “Frankenstein” hash that retains all API methods,
variables and json body structures for each API version used by the
plugin.
- One call to the global configuration in the version check to reduce
execution time.
- Cleanup some code and formatting.
- Added some comments.
2020-06-11 12:49:28 -04:00
Kevin Scott Adams 977b00a178 FreeNAS API v2.0 features
- Allows the use of FreeNAS API v2.0 so we can finally remove a VM drive
from the Proxmox VE GUI.
- Created a Frankenstein of out of FreeNAS.pm to allow 'one module to
rule them all' for v1.0 and v2.0 API's to FreeNAS.
- librest-client-perl changes so the call can have a <body/> to it on
GET and DELETE methods.
- Some spelling mistakes.
- Better syslog entries.
- More debbugging for testing purposes to the syslog.
2020-06-09 12:31:31 -04:00
Kevin Scott Adams 006dacc479 Add librest-client-perl to the package.
- librest-client-perl needs to be updated so it can have data in the
body of the call for GET and DELETE's.
2020-06-09 09:59:39 -04:00
Kevin Scott Adams 9f9b6ed171 Formatting and spelling errors
- Change some formatting and placement of lines.
- Fixed a few typos
2020-06-02 08:31:44 -04:00
Kevin Scott Adams 17e3625094 Merge remote-tracking branch 'origin/master' 2020-06-01 16:28:42 -04:00
Kevin Scott Adams 2a9e478704 Update the README.md for new features.
- Instruct the use of the package system to auto update the needed files
on the Prommox system
- Archive original README.md in the WIKI.
2020-06-01 16:24:55 -04:00
Kevin Scott Adams d46334e46a Set theme jekyll-theme-merlot 2020-05-26 12:22:36 -04:00
Kevin Scott Adams 233c85a141 Set theme jekyll-theme-merlot 2020-05-26 12:20:53 -04:00
Kevin Scott Adams 0cc39a4958 Add addtional file to new structure
- Forgot the FreeNAS.pm file in stable-6
2019-10-22 21:19:52 -04:00
Kevin Scott Adams 826e1e7ad2 Merge branch 'master' of
https://github.com/TheGrandWazoo/freenas-proxmox.git

Conflicts:
	perl5/PVE/Storage/ZFSPlugin.pm.patch
	stable-6/perl5/PVE/Storage/ZFSPlugin.pm.patch
2019-10-22 21:18:35 -04:00
Kevin Scott Adams 0e14d207ad Update patch sets
- Update ZFSPlugin.pm patch for Proxmox libpve-storage-perl version
6.0-9
2019-10-13 13:03:43 -04:00
Kevin Scott Adams c25fa0fe58 Update patch sets
- Update pvemanagerlib.js patch for Proxmox version to 6.0-7
- Update ZFSPlugin.pm patch for Proxmox version 6.0-8
- Adjusted new directory structure and added some missing files.
2019-10-13 09:26:52 -04:00
Kevin Scott Adams 5d40ce4de6 New Directory structure
- Just preping for a new install process.
2019-09-24 07:55:10 -04:00
Kevin Scott Adams 4b46f2240f Updated patches for the latest Proxmox VE updates and added donation
button.

- Update README.md to include a requested donation button for the
project. Thank you.
- Updated patch for pvemanagerlib.js for Proxmox VE pve-manager: 6.0-5
- Updated patch for apidoc.js for Proxmox VE pve-docs: 6.0-4
- Updated patch for ZFSPlugin.pm for Proxmox VE libpve-storage-perl:
6.0-6
2019-08-07 22:57:22 -04:00
Kevin Scott Adams 5091f0ae12 Patches created for latest 5.4 branch of Proxmox VE
- Patch created for pve-manager 5.4-11 specifically for pvemanagerlib.js
- Patch created for pve-manager 5.4-13 specifically for pvemanagerlib.js
- Patch created for libpve-storage-perl 5.0-44 specifically for
ZFSPlugin.pm
2019-08-05 18:02:01 -04:00
Kevin Scott Adams 16b3bd1a0b Update the FreeNAS-API related files to the latest Proxmox VE
- Updated apidoc.js.patch to reflect pve-docs: 5.4-2
- New apidoc-5.4-2_1.js.patch
- Updated pvemanagerlib.js.patch to reflect pve-manager: 5.4-5
- New pvemanagerlib-5.4-5_1.js.patch
- Updated ZFSPlugin.pm.patch to reflect libpve-storage-perl: 5.0-42
- New ZFSPlugin-5.0-42.pm.patch
- Revised the README.md
2019-05-11 11:13:54 -04:00
KevinAdams 94db23550b Merge branch 'master' of https://github.com/TheGrandWazoo/freenas-proxmox.git 2019-03-01 13:36:21 -05:00
Kevin Scott Adams ea73c4f7c9 Update to latest Proxmox VE update
- Update ZFSPlugin.pm to reflect 'libpve-storage-perl: 5.0-38'
- Update pvemanager.js to reflect 'pve-manager: 5.3-11'
- Update pve-docs.js to reflect 'pve-docs: 5.3-3'
2019-02-26 21:28:15 -05:00
Kevin Scott Adams 54d27aa58a Merge branch 'master' of https://github.com/TheGrandWazoo/freenas-proxmox.git 2019-02-05 07:40:16 -05:00
Kevin Scott Adams 920fbed342 Fixed issue on non-FreeNAS providers that would give a 'property' error.
- Issue was found that when saving a non-FreeNAS provider config that a
'delete: property error' was generated via the javascript. This issue
came from using the 'deleteEmpty' property used in the password fields
of the FreeNAS.pm provider pluging. Fixes issue #36, I hope.
2019-02-05 07:39:03 -05:00