Commit Graph

57 Commits

Author SHA1 Message Date
Kevin Scott Adams b9dd1d6f89 Update for Proxmox 8 and Bearer Token
- Patch updates for Proxmox VE 8
- Update to select Basic or Bearer authentication.
2024-01-06 13:43:35 -05:00
Kevin Scott Adams 9021ec22b7 Fix recursion error.
- When SSL redirect is enabled on TrueNAS and a change from V1 to V2
api's needs to happen then we overrun the limit of 1 on the recursion
loop. Set it to 2.
- Added some logging for TrueNAS-Scale conversion from slash (/) to dash
(-).
2022-06-05 18:57:52 -04:00
Kevin Scott Adams 0b760eefc3 Fix TrueNAS-Scale slash replacement.
- When changing from slashes (/) to dashes (-), I did not provide the
global parameter so a Storage/Tank/Disks would turn out to be
Storage-Tank/Disks causing a iSCSI: Failed to connect to LUN :
iscsi_service failed with : iscsi_service_reconnect_if_loggedin. Can not
reconnect right now.
2022-05-21 15:19:46 -04:00
Kevin Scott Adams c3b6f38c61 Fix TrueNAS-Scale parsing.
- TrueNAS-Scale returns 'application/json' so we need to catch that also
on the return code of 200 from a version API call.
2022-05-21 14:21:05 -04:00
Kevin Scott Adams 75f63b56d1 Update plugin for TrueNAS 13
- Created conditional to parse new TrueNAS 13 version.
- Created conditional to check for a 200 and that the Content-Type is
text/html so it will change to v2.0 of the API's. This is new behavior
in TrueNAS-Core 13.
2022-05-20 12:39:55 -04:00
Kevin Scott Adams 85a67077b2 Optimize methods.
- Instead of using foreach loops to iterate through an array change to
using a hash which the key is the value we are looking for.
2022-04-13 16:29:24 -04:00
Kevin Scott Adams 780c6590fe Update patches and some fixes.
- Add the true path to the debug statement when comparing targets.
- Add patch set for ZFSPlugin.pm for Storage lib 7.1-1
- Add patch set for pvemanagerlib.js for pve-manager version 7.1-11
- Add patch set for apidoc.js for pve-docs version 7.1-2.
- Create stable-7 directory for future installs based on Proxmox major
version each modules version.
2022-04-03 09:18:31 -04:00
Hans 4b0ec91508
Don't replace scfg data
Fix TheGrandWazoo/freenas-proxmox#107
2022-02-24 01:07:32 +08:00
Kevin Scott Adams 55f699e0b1 Update for issues with Proxmox 7.
- The eval{} block was originally returning a value that would allow
execution in the $@ conditional. This changed between Proxmox 6 and 7.
Why, no idea at the moment. Also, the original HASH was no longer valid
as a variable. I don't like the code block at this moment, I need to do
some regression testing to Proxmox 5 and FreeNAS/TrueNAS 11 and 12 to
see if I can clean up the conditional block. It was there for a reason I
just don't know at this moment.
2021-08-08 09:30:49 -04:00
Kevin Scott Adams 1048ee23a7 Missing right curly bracket in TrueNAS-SCALE Fix.
- Added a '}' at line 515.
- Fixes issues reported in #98 abd #75.
- freenas-proxmox-packer also fixed. The stable build directory somehow
was moved to the development building directory.
2021-04-15 20:29:59 -04:00
Kevin Scott Adams cc9707a14c TrueNAS-Scale slash substitution.
- Changed a slash (/) to a dash (-) on the $cfg->{'pool'} reference.
SCST does not support '/' characters on the device.
- Possible fix for #75.
2021-04-13 14:47:21 -04:00
sontru 6a1d82c8cd
Update ZFSPlugin.pm.patch
Full path added to multipath command.
Also need to install this tool: apt install multipath-tools
2020-10-16 16:24:37 +01:00
Kevin Scott Adams 084faf9903 Fixed pull request to support FreeNAS, TrueNAS-CORE and TrueNAS-SCALE.
- Adjusted Regex to parse the current TrueNAS-SCALE product and
versioning. Also changed the FreeNAS and TrueNAS so releases will be a
variable (e.g. - U, BETA, RC, MASTER)
- Used the $product_name to change use either a slash (/) for
FreeNAS/TrueNAS-CORE and a dash (-) for FreeNAS-SCALE.
2020-09-24 12:32:19 -04:00
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 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 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 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 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 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 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 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
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
KevinAdams 2f22e60626 Remove ZFSPoolPlugin.pm from repo.
- Mistakenly added the ZFSPoolPlugin.pm to the repo.
2019-02-04 10:48:05 -05:00
Kevin Scott Adams d0efcd49c5 Update Proxmox VE patches to 5.3-6
- Updated ZFSPlugin.pm.patch for libpve-storage-perl: 5.3-34
- Updated pvemanagerlib.js.patch for pve-manager: 5.3-6
- Patch file versions will now have a '_<#>' (e.g. 5.3-34_1) appended to
it denoting the patch version for that Proxmox VE lib/file version.
2018-12-24 07:36:33 -05:00
KevinAdams 5e255a6208 Fixed block size issue and updated for Proxmox VE 5.3-5
- Removed code in FreeNAS.PM that used the blocksize field from the GUI
for the use of iSCSI block size causing migration and large extent
sizes. Fixes issues #9 and #33.
- Prefixed 'ZFS' to the 'Block Size' label on the GUI.
- Updated for 5.3-5
2018-12-22 13:18:51 -05:00
Kevin Scott Adams 5e5f649fe1 Fix ZFS error: Unrecognized command "list_extent"
- A regression error that added the 'list_extent" method to the
$lun_cmds array in ZFSPlugin.pm. Fixes issue #32.
2018-12-15 09:50:44 -05:00
Kevin Scott Adams 82fe27242f Update patch set to the latest version of Proxmox-VE: 5.3-1
- Updated patch file for pvemanagerlib.js to pve-manager: 5.3-5
- Updated patch file for apidoc.js to pve-docs: 5.3-1
- Updated patch file for ZFSPlugin.pm to libpve-storage-perl: 5.0-33
2018-12-13 07:37:03 -05:00
Kevin Scott Adams 64afc5a70a Fix 'Parameter verification failed' when editing
- When changing the 'target' and 'pool' field to be editable in the Edit
ZFS over iSCSI panel it created an issue when you went to save any
change to that panel. The parameters were defined as { fixed => 1 }. Now
I don't know the backend of this but I changed it to { optional => 1} or
to { fixed => 0} they both worked. So I went with the { fixed => 0 } on
the 'target' and 'pool'. This fixes issue #27.
- Added a file with the version of the 'libpve-storage-perl' (e.g. -
ZFSPlugin-5.0-30.pm.patch to follow each version has it is changed.
2018-10-28 21:37:06 -04:00
Kevin Scott Adams 9a14130375 Updated files to latest Proxmox repo as of 2018-10-16.
- Updated pvemanagerlib.js.patch to reflect pve-manager version 5.2-9
- Updated ZFSPlugin.pm.patch to reflect libpve-storage-perl version
5.0-30
- Fixed issue with multipathing when NOT multipathing on the run_command
function.
- Fixed whitespace in README.md
2018-10-16 08:19:01 -04:00
Kevin Scott Adams 0e58a78e4a Add functionality for iSCSI multipathing
- Added patch from @tl8roy to add multipathing to the ZFSPluging.pm for
FreeNAS. I believe this was only patched and tested for FreeNAS.  I
tested WITHOUT using multipathing and I have had no issues. Closes
enhancement request #15 and reference #11.
2018-08-19 16:35:28 -04:00
Kevin Scott Adams 94d897f7d1 Added API Host
- This change allows the API traffic to be on a different interface then
the iSCSI Provider interface. This allows the selection of the FreeNAS
WebGUI address for HTTP/HTTPS to be on a specific interface instead of
"ALL" (0.0.0.0) interfaces.  If the API Host is not defined then the API
traffic will default to the iSCSI Provider interface.
2018-08-19 15:28:39 -04:00
Kevin Scott Adams 3f6059e75f Add test for the FreeNAS API
- Add a simple API test using the FreeNAS API call to get its version
number, which could prove useful in future versions. Closes #17
- Whitespace cleanup
2018-07-31 22:40:22 -04:00
Kevin Scott Adams 42edb8614e Few housekeeping changes
- Whitespace cleanup
- Removed the 'hardcoded' username and password. Will not throw an error
if it is not defined or blank in /etc/pve/storage.cfg for each ZFS via
ISCSI definition.
- Used a Ternary (Elvis - ?:) Operator for the scheme variable.
2018-07-31 21:33:21 -04:00
Tristan Lostroh cce719afb7 Add a function to return NAA
Adds a function to return NAA. This is required to match the WWID for multipath
2018-07-16 09:16:10 +10:00
Krzysztof Raczkowski d3c477c40d Support for SSL access to FreeNAS API. 2018-07-11 12:41:19 +02:00
Kevin Scott Adams a29328e7fa Undef $iscsi_lunid in FreeNAS.pm on line 457
- The perl code was creating a new variable in the ‘if’ code block by
using 'my' at the beginning of the assignment at line 452. Once the code
exited this block that variable was released and now defaulted to the
main block variable at line 441 which is still set to 'undef'. Removing
the 'my' from the assignment line allowed the code to use the main block
$iscsi_lunid variable.

Fixes issue #7
2018-07-09 15:38:54 -04:00
Kevin Scott Adams 23990fc008 Add tainted checking to iscsi_lunid
- So we do not have to change the /usr/bin/pvedaemon a small fix to
check the $item->{'iscsi_target'} varaible from the API call is needed.
This closes issue #3.
2018-06-26 15:00:09 -04:00
Kevin Scott Adams 1943a454a2 Small README.md update
- And the removed files did not take place on the last commit.
2018-06-10 23:07:40 -04:00