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.

perl5/PVE/Storage/LunCmd/FreeNAS.pm

@@ -27,6 +27,8 @@ my $runawayprevent = 0;                    # Recursion prevention variable
 my $freenas_api_version = "v1.0";          # Default to v1.0 of the API's
 my $freenas_api_methods = undef;           # API Methods Nested HASH Ref
 my $freenas_api_variables = undef;         # API Variable Nested HASH Ref
+my $truenas_version = undef;
+my $truenas_release_type = "Production";
 
 # FreeNAS/TrueNAS (CORE) API Versioning HashRef Matrix
 my $freenas_api_version_matrix = {
@@ -206,7 +208,7 @@ sub run_list_lu {
     my $result = undef;
     my $luns = freenas_list_lu($scfg);
     foreach my $lun (@$luns) {
-        syslog("info", (caller(0))[3] . " : Verifing '$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
+        syslog("info", (caller(0))[3] . " : Verifing '$dev_prefix$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
         if ($dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}} eq $object) {
             $result = $result_value_type eq "lun-id" ? $lun->{$freenas_api_variables->{'lunid'}} : $dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}};
             syslog("info",(caller(0))[3] . "($object) '$result_value_type' found $result");
@@ -232,7 +234,7 @@ sub run_list_extent {
     my $result = undef;
     my $luns = freenas_list_lu($scfg);
     foreach my $lun (@$luns) {
-        syslog("info", (caller(0))[3] . " : Verifing '$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
+        syslog("info", (caller(0))[3] . " : Verifing '$dev_prefix$lun->{$freenas_api_variables->{'extentpath'}}' and '$object'");
         if ($dev_prefix . $lun->{$freenas_api_variables->{'extentpath'}} eq $object) {
             $result = $lun->{$freenas_api_variables->{'extentnaa'}};
             syslog("info","FreeNAS::list_extent($object): naa found $result");
@@ -399,16 +401,28 @@ sub freenas_api_check {
         } else {
             $result = $freenas_rest_connection->responseContent();
         }
-        $result =~ s/^"//g;
+        $result =~ s/"//g;
         syslog("info", (caller(0))[3] . " : successful : Server version: " . $result);
-        $result =~ s/^((?!\-\d).*)\-(\d+)\.(\d+)\-([A-Za-z]*)(?(?=\-)\-(\d*)\-(\d*)|(\d?)\.?(\d?))//;
-        $product_name = $1;
-        my $freenas_version = sprintf("%02d%02d%02d%02d", $2, $3 || 0, $7 || 0, $8 || 0);
-        syslog("info", (caller(0))[3] . " : ". $product_name . " Unformatted Version: " . $freenas_version);
-        if ($freenas_version >= 11030100) {
+        if ($result =~ /^(TrueNAS|FreeNAS)-(\d+)\.(\d+)\-U(\d+)(?(?=\.)\.(\d+))$/) {
+            $product_name = $1;
+            $truenas_version = sprintf("%02d%02d%02d%02d", $2, $3 || 0, $4 || 0, $5 || 0);
+        } elsif ($result =~ /^(TrueNAS-SCALE)-(\d+)\.(\d+)(?(?=\-)-(\w+))\.(\d+)(?(?=\.)\.(\d+))(?(?=\-)-(\d+))$/) {
+            $product_name = $1;
+            $truenas_version = sprintf("%02d%02d%02d%02d", $2, $3 || 0, $5 || 0, $7 || 0);
+            $truenas_release_type = $4 || "Production";
+        } else {
+            $product_name = "Unknown";
+            $truenas_release_type = "Unknown";
+            syslog("error", (caller(0))[3] . " : Could not parse the version of TrueNAS.");
+        }
+        syslog("info", (caller(0))[3] . " : ". $product_name . " Unformatted Version: " . $truenas_version);
+        if ($truenas_version >= 11030100) {
             $freenas_api_version = "v2.0";
             $dev_prefix = "/dev/";
         }
+        if ($truenas_release_type ne "Production") {
+            syslog("warn", (caller(0))[3] . " : The '" . $product_name . "' release type of '" . $truenas_release_type . "' may not worked due to unsupported changes.");
+        }
     } else {
         syslog("info", (caller(0))[3] . " : REST Client already initialized");
     }

perl5/PVE/Storage/ZFSPlugin-7.1-1_1.pm.patch

@@ -0,0 +1,147 @@
+--- ZFSPlugin.pm.orig	2022-02-04 12:08:01.000000000 -0500
++++ ZFSPlugin.pm	2022-03-26 13:51:40.660068908 -0400
+@@ -10,6 +10,7 @@
+ 
+ use base qw(PVE::Storage::ZFSPoolPlugin);
+ use PVE::Storage::LunCmd::Comstar;
++use PVE::Storage::LunCmd::FreeNAS;
+ use PVE::Storage::LunCmd::Istgt;
+ use PVE::Storage::LunCmd::Iet;
+ use PVE::Storage::LunCmd::LIO;
+@@ -26,13 +27,14 @@
+     modify_lu   => 1,
+     add_view    => 1,
+     list_view   => 1,
++    list_extent => 1,
+     list_lu     => 1,
+ };
+ 
+ my $zfs_unknown_scsi_provider = sub {
+     my ($provider) = @_;
+ 
+-    die "$provider: unknown iscsi provider. Available [comstar, istgt, iet, LIO]";
++    die "$provider: unknown iscsi provider. Available [comstar, freenas, istgt, iet, LIO]";
+ };
+ 
+ my $zfs_get_base = sub {
+@@ -40,6 +42,8 @@
+ 
+     if ($scfg->{iscsiprovider} eq 'comstar') {
+         return PVE::Storage::LunCmd::Comstar::get_base;
++    } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++        return PVE::Storage::LunCmd::FreeNAS::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+         return PVE::Storage::LunCmd::Istgt::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -62,6 +66,8 @@
+     if ($lun_cmds->{$method}) {
+         if ($scfg->{iscsiprovider} eq 'comstar') {
+             $msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
++        } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++            $msg = PVE::Storage::LunCmd::FreeNAS::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+             $msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -166,6 +172,15 @@
+     die "lun_number for guid $guid is not a number";
+ }
+ 
++# Part of the multipath enhancement
++sub zfs_get_wwid_number {
++    my ($class, $scfg, $guid) = @_;
++
++    die "could not find lun_number for guid $guid" if !$guid;
++
++    return $class->zfs_request($scfg, undef, 'list_extent', $guid);
++}
++
+ # Configuration
+ 
+ sub type {
+@@ -184,6 +199,24 @@
+ 	    description => "iscsi provider",
+ 	    type => 'string',
+ 	},
++	# This is for FreeNAS iscsi and API intergration
++	# And some enhancements asked by the community
++	freenas_user => {
++	    description => "FreeNAS API Username",
++	    type => 'string',
++	},
++	freenas_password => {
++	    description => "FreeNAS API Password",
++	    type => 'string',
++	},
++	freenas_use_ssl => {
++	    description => "FreeNAS API access via SSL",
++	    type => 'boolean',
++	},
++	freenas_apiv4_host => {
++	    description => "FreeNAS API Host",
++	    type => 'string',
++	},
+ 	# this will disable write caching on comstar and istgt.
+ 	# it is not implemented for iet. iet blockio always operates with
+ 	# writethrough caching when not in readonly mode
+@@ -211,14 +244,18 @@
+ 	nodes => { optional => 1 },
+ 	disable => { optional => 1 },
+ 	portal => { fixed => 1 },
+-	target => { fixed => 1 },
+-	pool => { fixed => 1 },
++	target => { fixed => 0 },
++	pool => { fixed => 0 },
+ 	blocksize => { fixed => 1 },
+ 	iscsiprovider => { fixed => 1 },
+ 	nowritecache => { optional => 1 },
+ 	sparse => { optional => 1 },
+ 	comstar_hg => { optional => 1 },
+ 	comstar_tg => { optional => 1 },
++	freenas_user => { optional => 1 },
++	freenas_password => { optional => 1 },
++	freenas_use_ssl => { optional => 1 },
++	freenas_apiv4_host => { optional => 1 },
+ 	lio_tpg => { optional => 1 },
+ 	content => { optional => 1 },
+ 	bwlimit => { optional => 1 },
+@@ -243,6 +280,40 @@
+ 
+     my $path = "iscsi://$portal/$target/$lun";
+ 
++    # Multipath enhancement
++    eval {
++	my $wwid = $class->zfs_get_wwid_number($scfg, $guid);
++#	syslog(info,"JD: path get_lun_number guid $guid");
++
++	if ($wwid =~ /^([-\@\w.]+)$/) {
++	    $wwid = $1;                     # $data now untainted
++	} else {
++	    die "Bad data in '$wwid'";      # log this somewhere
++	}
++	my $wwid_end = substr $wwid, 16;
++
++	my $mapper = '';
++	sleep 3;
++	run_command("iscsiadm -m session --rescan");
++	sleep 3;
++	my $line = `/usr/sbin/multipath -ll | grep \"$wwid_end\"`;
++	my ($mapper_device) = split(' ', $line);
++	$mapper_device = "" unless $mapper_device;
++	$mapper .= $mapper_device;
++
++	if ($mapper =~ /^([-\@\w.]+)$/) {
++	    $mapper = $1;                   # $data now untainted
++	} else {
++	    $mapper = '';
++	}
++
++#	syslog(info,"Multipath mapper found: $mapper\n");
++	if ($mapper ne "") {
++	    $path = "/dev/mapper/$mapper";
++	    sleep 5;
++	}
++    };
++
+     return ($path, $vmid, $vtype);
+ }
+ 

perl5/PVE/Storage/ZFSPlugin.pm.patch

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
---- ZFSPlugin.pm.orig	2019-09-23 12:17:37.000000000 -0400
-+++ ZFSPlugin.pm	2019-10-13 09:31:58.780554103 -0400
-=======
---- ZFSPlugin.pm.orig	2019-09-03 04:24:37.000000000 -0400
-+++ ZFSPlugin.pm	2019-09-22 13:54:51.570048336 -0400
->>>>>>> branch 'master' of https://github.com/TheGrandWazoo/freenas-proxmox.git
+--- ZFSPlugin.pm.orig	2022-02-04 12:08:01.000000000 -0500
++++ ZFSPlugin.pm	2022-03-26 13:51:40.660068908 -0400
 @@ -10,6 +10,7 @@
  
  use base qw(PVE::Storage::ZFSPoolPlugin);
@@ -47,8 +42,8 @@
          } elsif ($scfg->{iscsiprovider} eq 'istgt') {
              $msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
          } elsif ($scfg->{iscsiprovider} eq 'iet') {
-@@ -162,6 +168,15 @@
-     return $class->zfs_request($scfg, undef, 'list_view', $guid);
+@@ -166,6 +172,15 @@
+     die "lun_number for guid $guid is not a number";
  }
  
 +# Part of the multipath enhancement
@@ -63,7 +58,7 @@
  # Configuration
  
  sub type {
-@@ -180,6 +195,24 @@
+@@ -184,6 +199,24 @@
  	    description => "iscsi provider",
  	    type => 'string',
  	},
@@ -88,7 +83,7 @@
  	# this will disable write caching on comstar and istgt.
  	# it is not implemented for iet. iet blockio always operates with
  	# writethrough caching when not in readonly mode
-@@ -207,14 +240,18 @@
+@@ -211,14 +244,18 @@
  	nodes => { optional => 1 },
  	disable => { optional => 1 },
  	portal => { fixed => 1 },
@@ -109,7 +104,7 @@
  	lio_tpg => { optional => 1 },
  	content => { optional => 1 },
  	bwlimit => { optional => 1 },
-@@ -239,6 +276,40 @@
+@@ -243,6 +280,40 @@
  
      my $path = "iscsi://$portal/$target/$lun";
  

pve-docs/api-viewer/apidoc-7.1-2_1.js.patch

@@ -0,0 +1,79 @@
+--- apidoc.js.orig	2021-11-15 10:07:34.000000000 -0500
++++ apidoc.js	2021-12-06 08:04:01.648822707 -0500
+@@ -44064,6 +44064,31 @@
+                            "type" : "string",
+                            "typetext" : "<string>"
+                         },
++                        "freenas_user" : {
++                           "description" : "FreeNAS user for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_password" : {
++                           "description" : "FreeNAS password for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_use_ssl" : {
++                           "description" : "FreeNAS API access via SSL",
++                           "optional" : 1,
++                           "type" : "boolean",
++                           "typetext" : "<boolean>"
++                        },
++                        "freenas_apiv4_host" : {
++                           "description" : "FreeNAS API Host via IPv4",
++                           "format" : "address",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "fuse" : {
+                            "description" : "Mount CephFS through FUSE.",
+                            "optional" : 1,
+@@ -44275,6 +44300,12 @@
+                            "type" : "boolean",
+                            "typetext" : "<boolean>"
+                         },
++                        "target" : {
++                           "description" : "iSCSI target.",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "transport" : {
+                            "description" : "Gluster transport: tcp or rdma",
+                            "enum" : [
+@@ -44547,6 +44578,31 @@
+                      "optional" : 1,
+                      "type" : "string",
+                      "typetext" : "<string>"
++                  },
++                  "freenas_user" : {
++                     "description" : "FreeNAS user for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_password" : {
++                     "description" : "FreeNAS password for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_use_ssl" : {
++                     "description" : "FreeNAS API access via SSL",
++                     "optional" : 1,
++                     "type" : "boolean",
++                     "typetext" : "<boolean>"
++                  },
++                  "freenas_apiv4_host" : {
++                     "description" : "FreeNAS API Host via IPv4",
++                     "format" : "address",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
+                   },
+                   "fuse" : {
+                      "description" : "Mount CephFS through FUSE.",

pve-docs/api-viewer/apidoc.js.patch

@@ -1,6 +1,6 @@
---- apidoc.js.orig	2019-07-15 15:45:00.000000000 -0400
-+++ apidoc.js	2019-08-07 13:28:29.292382229 -0400
-@@ -35001,6 +35001,31 @@
+--- apidoc.js.orig	2021-11-15 10:07:34.000000000 -0500
++++ apidoc.js	2021-12-06 08:04:01.648822707 -0500
+@@ -44064,6 +44064,31 @@
                             "type" : "string",
                             "typetext" : "<string>"
                          },
@@ -32,7 +32,7 @@
                          "fuse" : {
                             "description" : "Mount CephFS through FUSE.",
                             "optional" : 1,
-@@ -35157,6 +35182,12 @@
+@@ -44275,6 +44300,12 @@
                             "type" : "boolean",
                             "typetext" : "<boolean>"
                          },
@@ -45,7 +45,7 @@
                          "transport" : {
                             "description" : "Gluster transport: tcp or rdma",
                             "enum" : [
-@@ -35362,6 +35393,31 @@
+@@ -44547,6 +44578,31 @@
                       "optional" : 1,
                       "type" : "string",
                       "typetext" : "<string>"

pve-manager/js/pvemanagerlib-7.1-11_1.js.patch

@@ -0,0 +1,189 @@
+--- pvemanagerlib.js.orig	2022-03-17 09:08:40.000000000 -0400
++++ pvemanagerlib.js	2022-04-03 08:54:10.229689187 -0400
+@@ -8068,6 +8068,7 @@
+     alias: ['widget.pveiScsiProviderSelector'],
+     comboItems: [
+ 	['comstar', 'Comstar'],
++	['freenas', 'FreeNAS-API'],
+ 	['istgt', 'istgt'],
+ 	['iet', 'IET'],
+ 	['LIO', 'LIO'],
+@@ -49636,6 +49637,7 @@
+ 	data: {
+ 	    isLIO: false,
+ 	    isComstar: true,
++        isFreeNAS: false,
+ 	    hasWriteCacheOption: true,
+ 	},
+     },
+@@ -49648,10 +49650,26 @@
+ 	    },
+ 	},
+ 	changeISCSIProvider: function(f, newVal, oldVal) {
++	    var me = this;
+ 	    var vm = this.getViewModel();
+ 	    vm.set('isLIO', newVal === 'LIO');
+ 	    vm.set('isComstar', newVal === 'comstar');
+-	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
++	    vm.set('isFreeNAS', newVal === 'freenas');
++	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
++	    if (newVal !== 'freenas') {
++		me.lookupReference('freenas_use_ssl_field').setValue(false);
++		me.lookupReference('freenas_apiv4_host_field').setValue('');
++		me.lookupReference('freenas_user_field').setValue('');
++		me.lookupReference('freenas_user_field').allowBlank = true;
++		me.lookupReference('freenas_password_field').setValue('');
++		me.lookupReference('freenas_password_field').allowBlank = true;
++		me.lookupReference('freenas_confirmpw_field').setValue('');
++		me.lookupReference('freenas_confirmpw_field').allowBlank = true;
++	    } else {
++		me.lookupReference('freenas_user_field').allowBlank = false;
++		me.lookupReference('freenas_password_field').allowBlank = false;
++		me.lookupReference('freenas_confirmpw_field').allowBlank = false;
++	    }
+ 	},
+     },
+ 
+@@ -49669,6 +49687,7 @@
+     },
+ 
+     setValues: function(values) {
++        values.freenas_confirmpw = values.freenas_password;
+ 	values.writecache = values.nowritecache ? 0 : 1;
+ 	this.callParent([values]);
+     },
+@@ -49685,7 +49704,7 @@
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'pool',
+ 		value: '',
+ 		fieldLabel: gettext('Pool'),
+@@ -49695,11 +49714,11 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'blocksize',
+ 		value: '4k',
+-		fieldLabel: gettext('Block Size'),
++		fieldLabel: gettext('ZFS Block Size'),
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'target',
+ 		value: '',
+ 		fieldLabel: gettext('Target'),
+@@ -49710,9 +49729,34 @@
+ 		name: 'comstar_tg',
+ 		value: '',
+ 		fieldLabel: gettext('Target group'),
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		allowBlank: true,
+ 	    },
++	    {
++		xtype: 'proxmoxcheckbox',
++		name: 'freenas_use_ssl',
++		reference: 'freenas_use_ssl_field',
++		inputId: 'freenas_use_ssl_field',
++		checked: false,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		uncheckedValue: 0,
++		fieldLabel: gettext('API use SSL'),
++	    },
++	    {
++		xtype: 'textfield',
++		name: 'freenas_user',
++		reference: 'freenas_user_field',
++		inputId: 'freenas_user_field',
++		value: '',
++		fieldLabel: gettext('API Username'),
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++	    },
+ 	];
+ 
+ 	me.column2 = [
+@@ -49742,7 +49786,9 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'comstar_hg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		fieldLabel: gettext('Host group'),
+ 		allowBlank: true,
+ 	    },
+@@ -49750,9 +49796,62 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'lio_tpg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
+-		allowBlank: false,
++		bind: {
++		    hidden: '{!isLIO}'
++		},
+ 		fieldLabel: gettext('Target portal group'),
++		allowBlank: true
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_apiv4_host',
++		reference: 'freenas_apiv4_host_field',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API IPv4 Host'),
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_password',
++		reference: 'freenas_password_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API Password'),
++		change: function(f, value) {
++		    if (f.rendered) {
++			f.up().down('field[name=freenas_confirmpw]').validate();
++		    }
++		},
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_confirmpw',
++		reference: 'freenas_confirmpw_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		submitValue: false,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('Confirm Password'),
++		validator: function(value) {
++		    var pw = this.up().down('field[name=freenas_password]').getValue();
++		    if (pw !== value) {
++			return "Passwords do not match!";
++		    }
++		    return true;
++		},
+ 	    },
+ 	];
+ 

pve-manager/js/pvemanagerlib.js.patch

@@ -1,6 +1,6 @@
---- pvemanagerlib.js.orig	2021-05-27 08:28:35.000000000 -0400
-+++ pvemanagerlib.js	2021-06-10 11:03:15.380175988 -0400
-@@ -7900,6 +7900,7 @@
+--- pvemanagerlib.js.orig	2022-03-17 09:08:40.000000000 -0400
++++ pvemanagerlib.js	2022-04-03 08:54:10.229689187 -0400
+@@ -8068,6 +8068,7 @@
      alias: ['widget.pveiScsiProviderSelector'],
      comboItems: [
  	['comstar', 'Comstar'],
@@ -8,7 +8,7 @@
  	['istgt', 'istgt'],
  	['iet', 'IET'],
  	['LIO', 'LIO'],
-@@ -47367,6 +47368,7 @@
+@@ -49636,6 +49637,7 @@
  	data: {
  	    isLIO: false,
  	    isComstar: true,
@@ -16,7 +16,7 @@
  	    hasWriteCacheOption: true,
  	},
      },
-@@ -47379,10 +47381,26 @@
+@@ -49648,10 +49650,26 @@
  	    },
  	},
  	changeISCSIProvider: function(f, newVal, oldVal) {
@@ -44,7 +44,7 @@
  	},
      },
  
-@@ -47400,6 +47418,7 @@
+@@ -49669,6 +49687,7 @@
      },
  
      setValues: function(values) {
@@ -52,7 +52,7 @@
  	values.writecache = values.nowritecache ? 0 : 1;
  	this.callParent([values]);
      },
-@@ -47416,7 +47435,7 @@
+@@ -49685,7 +49704,7 @@
  		allowBlank: false,
  	    },
  	    {
@@ -61,7 +61,7 @@
  		name: 'pool',
  		value: '',
  		fieldLabel: gettext('Pool'),
-@@ -47426,11 +47445,11 @@
+@@ -49695,11 +49714,11 @@
  		xtype: me.isCreate ? 'textfield' : 'displayfield',
  		name: 'blocksize',
  		value: '4k',
@@ -75,7 +75,7 @@
  		name: 'target',
  		value: '',
  		fieldLabel: gettext('Target'),
-@@ -47441,9 +47460,34 @@
+@@ -49710,9 +49729,34 @@
  		name: 'comstar_tg',
  		value: '',
  		fieldLabel: gettext('Target group'),
@@ -111,7 +111,7 @@
  	];
  
  	me.column2 = [
-@@ -47473,7 +47517,9 @@
+@@ -49742,7 +49786,9 @@
  		xtype: me.isCreate ? 'textfield' : 'displayfield',
  		name: 'comstar_hg',
  		value: '',
@@ -122,7 +122,7 @@
  		fieldLabel: gettext('Host group'),
  		allowBlank: true,
  	    },
-@@ -47481,9 +47527,62 @@
+@@ -49750,9 +49796,62 @@
  		xtype: me.isCreate ? 'textfield' : 'displayfield',
  		name: 'lio_tpg',
  		value: '',

stable-7/perl5/PVE/Storage/ZFSPlugin-7.1-1_1.pm.patch

@@ -0,0 +1,147 @@
+--- ZFSPlugin.pm.orig	2022-02-04 12:08:01.000000000 -0500
++++ ZFSPlugin.pm	2022-03-26 13:51:40.660068908 -0400
+@@ -10,6 +10,7 @@
+ 
+ use base qw(PVE::Storage::ZFSPoolPlugin);
+ use PVE::Storage::LunCmd::Comstar;
++use PVE::Storage::LunCmd::FreeNAS;
+ use PVE::Storage::LunCmd::Istgt;
+ use PVE::Storage::LunCmd::Iet;
+ use PVE::Storage::LunCmd::LIO;
+@@ -26,13 +27,14 @@
+     modify_lu   => 1,
+     add_view    => 1,
+     list_view   => 1,
++    list_extent => 1,
+     list_lu     => 1,
+ };
+ 
+ my $zfs_unknown_scsi_provider = sub {
+     my ($provider) = @_;
+ 
+-    die "$provider: unknown iscsi provider. Available [comstar, istgt, iet, LIO]";
++    die "$provider: unknown iscsi provider. Available [comstar, freenas, istgt, iet, LIO]";
+ };
+ 
+ my $zfs_get_base = sub {
+@@ -40,6 +42,8 @@
+ 
+     if ($scfg->{iscsiprovider} eq 'comstar') {
+         return PVE::Storage::LunCmd::Comstar::get_base;
++    } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++        return PVE::Storage::LunCmd::FreeNAS::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+         return PVE::Storage::LunCmd::Istgt::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -62,6 +66,8 @@
+     if ($lun_cmds->{$method}) {
+         if ($scfg->{iscsiprovider} eq 'comstar') {
+             $msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
++        } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++            $msg = PVE::Storage::LunCmd::FreeNAS::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+             $msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -166,6 +172,15 @@
+     die "lun_number for guid $guid is not a number";
+ }
+ 
++# Part of the multipath enhancement
++sub zfs_get_wwid_number {
++    my ($class, $scfg, $guid) = @_;
++
++    die "could not find lun_number for guid $guid" if !$guid;
++
++    return $class->zfs_request($scfg, undef, 'list_extent', $guid);
++}
++
+ # Configuration
+ 
+ sub type {
+@@ -184,6 +199,24 @@
+ 	    description => "iscsi provider",
+ 	    type => 'string',
+ 	},
++	# This is for FreeNAS iscsi and API intergration
++	# And some enhancements asked by the community
++	freenas_user => {
++	    description => "FreeNAS API Username",
++	    type => 'string',
++	},
++	freenas_password => {
++	    description => "FreeNAS API Password",
++	    type => 'string',
++	},
++	freenas_use_ssl => {
++	    description => "FreeNAS API access via SSL",
++	    type => 'boolean',
++	},
++	freenas_apiv4_host => {
++	    description => "FreeNAS API Host",
++	    type => 'string',
++	},
+ 	# this will disable write caching on comstar and istgt.
+ 	# it is not implemented for iet. iet blockio always operates with
+ 	# writethrough caching when not in readonly mode
+@@ -211,14 +244,18 @@
+ 	nodes => { optional => 1 },
+ 	disable => { optional => 1 },
+ 	portal => { fixed => 1 },
+-	target => { fixed => 1 },
+-	pool => { fixed => 1 },
++	target => { fixed => 0 },
++	pool => { fixed => 0 },
+ 	blocksize => { fixed => 1 },
+ 	iscsiprovider => { fixed => 1 },
+ 	nowritecache => { optional => 1 },
+ 	sparse => { optional => 1 },
+ 	comstar_hg => { optional => 1 },
+ 	comstar_tg => { optional => 1 },
++	freenas_user => { optional => 1 },
++	freenas_password => { optional => 1 },
++	freenas_use_ssl => { optional => 1 },
++	freenas_apiv4_host => { optional => 1 },
+ 	lio_tpg => { optional => 1 },
+ 	content => { optional => 1 },
+ 	bwlimit => { optional => 1 },
+@@ -243,6 +280,40 @@
+ 
+     my $path = "iscsi://$portal/$target/$lun";
+ 
++    # Multipath enhancement
++    eval {
++	my $wwid = $class->zfs_get_wwid_number($scfg, $guid);
++#	syslog(info,"JD: path get_lun_number guid $guid");
++
++	if ($wwid =~ /^([-\@\w.]+)$/) {
++	    $wwid = $1;                     # $data now untainted
++	} else {
++	    die "Bad data in '$wwid'";      # log this somewhere
++	}
++	my $wwid_end = substr $wwid, 16;
++
++	my $mapper = '';
++	sleep 3;
++	run_command("iscsiadm -m session --rescan");
++	sleep 3;
++	my $line = `/usr/sbin/multipath -ll | grep \"$wwid_end\"`;
++	my ($mapper_device) = split(' ', $line);
++	$mapper_device = "" unless $mapper_device;
++	$mapper .= $mapper_device;
++
++	if ($mapper =~ /^([-\@\w.]+)$/) {
++	    $mapper = $1;                   # $data now untainted
++	} else {
++	    $mapper = '';
++	}
++
++#	syslog(info,"Multipath mapper found: $mapper\n");
++	if ($mapper ne "") {
++	    $path = "/dev/mapper/$mapper";
++	    sleep 5;
++	}
++    };
++
+     return ($path, $vmid, $vtype);
+ }
+ 

stable-7/perl5/PVE/Storage/ZFSPlugin.pm.patch

@@ -0,0 +1,147 @@
+--- ZFSPlugin.pm.orig	2022-02-04 12:08:01.000000000 -0500
++++ ZFSPlugin.pm	2022-03-26 13:51:40.660068908 -0400
+@@ -10,6 +10,7 @@
+ 
+ use base qw(PVE::Storage::ZFSPoolPlugin);
+ use PVE::Storage::LunCmd::Comstar;
++use PVE::Storage::LunCmd::FreeNAS;
+ use PVE::Storage::LunCmd::Istgt;
+ use PVE::Storage::LunCmd::Iet;
+ use PVE::Storage::LunCmd::LIO;
+@@ -26,13 +27,14 @@
+     modify_lu   => 1,
+     add_view    => 1,
+     list_view   => 1,
++    list_extent => 1,
+     list_lu     => 1,
+ };
+ 
+ my $zfs_unknown_scsi_provider = sub {
+     my ($provider) = @_;
+ 
+-    die "$provider: unknown iscsi provider. Available [comstar, istgt, iet, LIO]";
++    die "$provider: unknown iscsi provider. Available [comstar, freenas, istgt, iet, LIO]";
+ };
+ 
+ my $zfs_get_base = sub {
+@@ -40,6 +42,8 @@
+ 
+     if ($scfg->{iscsiprovider} eq 'comstar') {
+         return PVE::Storage::LunCmd::Comstar::get_base;
++    } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++        return PVE::Storage::LunCmd::FreeNAS::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+         return PVE::Storage::LunCmd::Istgt::get_base;
+     } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -62,6 +66,8 @@
+     if ($lun_cmds->{$method}) {
+         if ($scfg->{iscsiprovider} eq 'comstar') {
+             $msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
++        } elsif ($scfg->{iscsiprovider} eq 'freenas') {
++            $msg = PVE::Storage::LunCmd::FreeNAS::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'istgt') {
+             $msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
+         } elsif ($scfg->{iscsiprovider} eq 'iet') {
+@@ -166,6 +172,15 @@
+     die "lun_number for guid $guid is not a number";
+ }
+ 
++# Part of the multipath enhancement
++sub zfs_get_wwid_number {
++    my ($class, $scfg, $guid) = @_;
++
++    die "could not find lun_number for guid $guid" if !$guid;
++
++    return $class->zfs_request($scfg, undef, 'list_extent', $guid);
++}
++
+ # Configuration
+ 
+ sub type {
+@@ -184,6 +199,24 @@
+ 	    description => "iscsi provider",
+ 	    type => 'string',
+ 	},
++	# This is for FreeNAS iscsi and API intergration
++	# And some enhancements asked by the community
++	freenas_user => {
++	    description => "FreeNAS API Username",
++	    type => 'string',
++	},
++	freenas_password => {
++	    description => "FreeNAS API Password",
++	    type => 'string',
++	},
++	freenas_use_ssl => {
++	    description => "FreeNAS API access via SSL",
++	    type => 'boolean',
++	},
++	freenas_apiv4_host => {
++	    description => "FreeNAS API Host",
++	    type => 'string',
++	},
+ 	# this will disable write caching on comstar and istgt.
+ 	# it is not implemented for iet. iet blockio always operates with
+ 	# writethrough caching when not in readonly mode
+@@ -211,14 +244,18 @@
+ 	nodes => { optional => 1 },
+ 	disable => { optional => 1 },
+ 	portal => { fixed => 1 },
+-	target => { fixed => 1 },
+-	pool => { fixed => 1 },
++	target => { fixed => 0 },
++	pool => { fixed => 0 },
+ 	blocksize => { fixed => 1 },
+ 	iscsiprovider => { fixed => 1 },
+ 	nowritecache => { optional => 1 },
+ 	sparse => { optional => 1 },
+ 	comstar_hg => { optional => 1 },
+ 	comstar_tg => { optional => 1 },
++	freenas_user => { optional => 1 },
++	freenas_password => { optional => 1 },
++	freenas_use_ssl => { optional => 1 },
++	freenas_apiv4_host => { optional => 1 },
+ 	lio_tpg => { optional => 1 },
+ 	content => { optional => 1 },
+ 	bwlimit => { optional => 1 },
+@@ -243,6 +280,40 @@
+ 
+     my $path = "iscsi://$portal/$target/$lun";
+ 
++    # Multipath enhancement
++    eval {
++	my $wwid = $class->zfs_get_wwid_number($scfg, $guid);
++#	syslog(info,"JD: path get_lun_number guid $guid");
++
++	if ($wwid =~ /^([-\@\w.]+)$/) {
++	    $wwid = $1;                     # $data now untainted
++	} else {
++	    die "Bad data in '$wwid'";      # log this somewhere
++	}
++	my $wwid_end = substr $wwid, 16;
++
++	my $mapper = '';
++	sleep 3;
++	run_command("iscsiadm -m session --rescan");
++	sleep 3;
++	my $line = `/usr/sbin/multipath -ll | grep \"$wwid_end\"`;
++	my ($mapper_device) = split(' ', $line);
++	$mapper_device = "" unless $mapper_device;
++	$mapper .= $mapper_device;
++
++	if ($mapper =~ /^([-\@\w.]+)$/) {
++	    $mapper = $1;                   # $data now untainted
++	} else {
++	    $mapper = '';
++	}
++
++#	syslog(info,"Multipath mapper found: $mapper\n");
++	if ($mapper ne "") {
++	    $path = "/dev/mapper/$mapper";
++	    sleep 5;
++	}
++    };
++
+     return ($path, $vmid, $vtype);
+ }
+ 

stable-7/pve-docs/api-viewer/apidoc-7.1-2_1.js.patch

@@ -0,0 +1,79 @@
+--- apidoc.js.orig	2021-11-15 10:07:34.000000000 -0500
++++ apidoc.js	2021-12-06 08:04:01.648822707 -0500
+@@ -44064,6 +44064,31 @@
+                            "type" : "string",
+                            "typetext" : "<string>"
+                         },
++                        "freenas_user" : {
++                           "description" : "FreeNAS user for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_password" : {
++                           "description" : "FreeNAS password for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_use_ssl" : {
++                           "description" : "FreeNAS API access via SSL",
++                           "optional" : 1,
++                           "type" : "boolean",
++                           "typetext" : "<boolean>"
++                        },
++                        "freenas_apiv4_host" : {
++                           "description" : "FreeNAS API Host via IPv4",
++                           "format" : "address",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "fuse" : {
+                            "description" : "Mount CephFS through FUSE.",
+                            "optional" : 1,
+@@ -44275,6 +44300,12 @@
+                            "type" : "boolean",
+                            "typetext" : "<boolean>"
+                         },
++                        "target" : {
++                           "description" : "iSCSI target.",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "transport" : {
+                            "description" : "Gluster transport: tcp or rdma",
+                            "enum" : [
+@@ -44547,6 +44578,31 @@
+                      "optional" : 1,
+                      "type" : "string",
+                      "typetext" : "<string>"
++                  },
++                  "freenas_user" : {
++                     "description" : "FreeNAS user for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_password" : {
++                     "description" : "FreeNAS password for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_use_ssl" : {
++                     "description" : "FreeNAS API access via SSL",
++                     "optional" : 1,
++                     "type" : "boolean",
++                     "typetext" : "<boolean>"
++                  },
++                  "freenas_apiv4_host" : {
++                     "description" : "FreeNAS API Host via IPv4",
++                     "format" : "address",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
+                   },
+                   "fuse" : {
+                      "description" : "Mount CephFS through FUSE.",

stable-7/pve-docs/api-viewer/apidoc.js.patch

@@ -0,0 +1,79 @@
+--- apidoc.js.orig	2021-11-15 10:07:34.000000000 -0500
++++ apidoc.js	2021-12-06 08:04:01.648822707 -0500
+@@ -44064,6 +44064,31 @@
+                            "type" : "string",
+                            "typetext" : "<string>"
+                         },
++                        "freenas_user" : {
++                           "description" : "FreeNAS user for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_password" : {
++                           "description" : "FreeNAS password for API access",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
++                        "freenas_use_ssl" : {
++                           "description" : "FreeNAS API access via SSL",
++                           "optional" : 1,
++                           "type" : "boolean",
++                           "typetext" : "<boolean>"
++                        },
++                        "freenas_apiv4_host" : {
++                           "description" : "FreeNAS API Host via IPv4",
++                           "format" : "address",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "fuse" : {
+                            "description" : "Mount CephFS through FUSE.",
+                            "optional" : 1,
+@@ -44275,6 +44300,12 @@
+                            "type" : "boolean",
+                            "typetext" : "<boolean>"
+                         },
++                        "target" : {
++                           "description" : "iSCSI target.",
++                           "optional" : 1,
++                           "type" : "string",
++                           "typetext" : "<string>"
++                        },
+                         "transport" : {
+                            "description" : "Gluster transport: tcp or rdma",
+                            "enum" : [
+@@ -44547,6 +44578,31 @@
+                      "optional" : 1,
+                      "type" : "string",
+                      "typetext" : "<string>"
++                  },
++                  "freenas_user" : {
++                     "description" : "FreeNAS user for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_password" : {
++                     "description" : "FreeNAS password for API access",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
++                  },
++                  "freenas_use_ssl" : {
++                     "description" : "FreeNAS API access via SSL",
++                     "optional" : 1,
++                     "type" : "boolean",
++                     "typetext" : "<boolean>"
++                  },
++                  "freenas_apiv4_host" : {
++                     "description" : "FreeNAS API Host via IPv4",
++                     "format" : "address",
++                     "optional" : 1,
++                     "type" : "string",
++                     "typetext" : "<string>"
+                   },
+                   "fuse" : {
+                      "description" : "Mount CephFS through FUSE.",

stable-7/pve-manager/js/pvemanagerlib-7.1-11_1.js.patch

@@ -0,0 +1,189 @@
+--- pvemanagerlib.js.orig	2022-03-17 09:08:40.000000000 -0400
++++ pvemanagerlib.js	2022-04-03 08:54:10.229689187 -0400
+@@ -8068,6 +8068,7 @@
+     alias: ['widget.pveiScsiProviderSelector'],
+     comboItems: [
+ 	['comstar', 'Comstar'],
++	['freenas', 'FreeNAS-API'],
+ 	['istgt', 'istgt'],
+ 	['iet', 'IET'],
+ 	['LIO', 'LIO'],
+@@ -49636,6 +49637,7 @@
+ 	data: {
+ 	    isLIO: false,
+ 	    isComstar: true,
++        isFreeNAS: false,
+ 	    hasWriteCacheOption: true,
+ 	},
+     },
+@@ -49648,10 +49650,26 @@
+ 	    },
+ 	},
+ 	changeISCSIProvider: function(f, newVal, oldVal) {
++	    var me = this;
+ 	    var vm = this.getViewModel();
+ 	    vm.set('isLIO', newVal === 'LIO');
+ 	    vm.set('isComstar', newVal === 'comstar');
+-	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
++	    vm.set('isFreeNAS', newVal === 'freenas');
++	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
++	    if (newVal !== 'freenas') {
++		me.lookupReference('freenas_use_ssl_field').setValue(false);
++		me.lookupReference('freenas_apiv4_host_field').setValue('');
++		me.lookupReference('freenas_user_field').setValue('');
++		me.lookupReference('freenas_user_field').allowBlank = true;
++		me.lookupReference('freenas_password_field').setValue('');
++		me.lookupReference('freenas_password_field').allowBlank = true;
++		me.lookupReference('freenas_confirmpw_field').setValue('');
++		me.lookupReference('freenas_confirmpw_field').allowBlank = true;
++	    } else {
++		me.lookupReference('freenas_user_field').allowBlank = false;
++		me.lookupReference('freenas_password_field').allowBlank = false;
++		me.lookupReference('freenas_confirmpw_field').allowBlank = false;
++	    }
+ 	},
+     },
+ 
+@@ -49669,6 +49687,7 @@
+     },
+ 
+     setValues: function(values) {
++        values.freenas_confirmpw = values.freenas_password;
+ 	values.writecache = values.nowritecache ? 0 : 1;
+ 	this.callParent([values]);
+     },
+@@ -49685,7 +49704,7 @@
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'pool',
+ 		value: '',
+ 		fieldLabel: gettext('Pool'),
+@@ -49695,11 +49714,11 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'blocksize',
+ 		value: '4k',
+-		fieldLabel: gettext('Block Size'),
++		fieldLabel: gettext('ZFS Block Size'),
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'target',
+ 		value: '',
+ 		fieldLabel: gettext('Target'),
+@@ -49710,9 +49729,34 @@
+ 		name: 'comstar_tg',
+ 		value: '',
+ 		fieldLabel: gettext('Target group'),
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		allowBlank: true,
+ 	    },
++	    {
++		xtype: 'proxmoxcheckbox',
++		name: 'freenas_use_ssl',
++		reference: 'freenas_use_ssl_field',
++		inputId: 'freenas_use_ssl_field',
++		checked: false,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		uncheckedValue: 0,
++		fieldLabel: gettext('API use SSL'),
++	    },
++	    {
++		xtype: 'textfield',
++		name: 'freenas_user',
++		reference: 'freenas_user_field',
++		inputId: 'freenas_user_field',
++		value: '',
++		fieldLabel: gettext('API Username'),
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++	    },
+ 	];
+ 
+ 	me.column2 = [
+@@ -49742,7 +49786,9 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'comstar_hg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		fieldLabel: gettext('Host group'),
+ 		allowBlank: true,
+ 	    },
+@@ -49750,9 +49796,62 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'lio_tpg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
+-		allowBlank: false,
++		bind: {
++		    hidden: '{!isLIO}'
++		},
+ 		fieldLabel: gettext('Target portal group'),
++		allowBlank: true
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_apiv4_host',
++		reference: 'freenas_apiv4_host_field',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API IPv4 Host'),
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_password',
++		reference: 'freenas_password_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API Password'),
++		change: function(f, value) {
++		    if (f.rendered) {
++			f.up().down('field[name=freenas_confirmpw]').validate();
++		    }
++		},
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_confirmpw',
++		reference: 'freenas_confirmpw_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		submitValue: false,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('Confirm Password'),
++		validator: function(value) {
++		    var pw = this.up().down('field[name=freenas_password]').getValue();
++		    if (pw !== value) {
++			return "Passwords do not match!";
++		    }
++		    return true;
++		},
+ 	    },
+ 	];
+ 

stable-7/pve-manager/js/pvemanagerlib.js.patch

@@ -0,0 +1,189 @@
+--- pvemanagerlib.js.orig	2022-03-17 09:08:40.000000000 -0400
++++ pvemanagerlib.js	2022-04-03 08:54:10.229689187 -0400
+@@ -8068,6 +8068,7 @@
+     alias: ['widget.pveiScsiProviderSelector'],
+     comboItems: [
+ 	['comstar', 'Comstar'],
++	['freenas', 'FreeNAS-API'],
+ 	['istgt', 'istgt'],
+ 	['iet', 'IET'],
+ 	['LIO', 'LIO'],
+@@ -49636,6 +49637,7 @@
+ 	data: {
+ 	    isLIO: false,
+ 	    isComstar: true,
++        isFreeNAS: false,
+ 	    hasWriteCacheOption: true,
+ 	},
+     },
+@@ -49648,10 +49650,26 @@
+ 	    },
+ 	},
+ 	changeISCSIProvider: function(f, newVal, oldVal) {
++	    var me = this;
+ 	    var vm = this.getViewModel();
+ 	    vm.set('isLIO', newVal === 'LIO');
+ 	    vm.set('isComstar', newVal === 'comstar');
+-	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
++	    vm.set('isFreeNAS', newVal === 'freenas');
++	    vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
++	    if (newVal !== 'freenas') {
++		me.lookupReference('freenas_use_ssl_field').setValue(false);
++		me.lookupReference('freenas_apiv4_host_field').setValue('');
++		me.lookupReference('freenas_user_field').setValue('');
++		me.lookupReference('freenas_user_field').allowBlank = true;
++		me.lookupReference('freenas_password_field').setValue('');
++		me.lookupReference('freenas_password_field').allowBlank = true;
++		me.lookupReference('freenas_confirmpw_field').setValue('');
++		me.lookupReference('freenas_confirmpw_field').allowBlank = true;
++	    } else {
++		me.lookupReference('freenas_user_field').allowBlank = false;
++		me.lookupReference('freenas_password_field').allowBlank = false;
++		me.lookupReference('freenas_confirmpw_field').allowBlank = false;
++	    }
+ 	},
+     },
+ 
+@@ -49669,6 +49687,7 @@
+     },
+ 
+     setValues: function(values) {
++        values.freenas_confirmpw = values.freenas_password;
+ 	values.writecache = values.nowritecache ? 0 : 1;
+ 	this.callParent([values]);
+     },
+@@ -49685,7 +49704,7 @@
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'pool',
+ 		value: '',
+ 		fieldLabel: gettext('Pool'),
+@@ -49695,11 +49714,11 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'blocksize',
+ 		value: '4k',
+-		fieldLabel: gettext('Block Size'),
++		fieldLabel: gettext('ZFS Block Size'),
+ 		allowBlank: false,
+ 	    },
+ 	    {
+-		xtype: me.isCreate ? 'textfield' : 'displayfield',
++		xtype: 'textfield',
+ 		name: 'target',
+ 		value: '',
+ 		fieldLabel: gettext('Target'),
+@@ -49710,9 +49729,34 @@
+ 		name: 'comstar_tg',
+ 		value: '',
+ 		fieldLabel: gettext('Target group'),
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		allowBlank: true,
+ 	    },
++	    {
++		xtype: 'proxmoxcheckbox',
++		name: 'freenas_use_ssl',
++		reference: 'freenas_use_ssl_field',
++		inputId: 'freenas_use_ssl_field',
++		checked: false,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		uncheckedValue: 0,
++		fieldLabel: gettext('API use SSL'),
++	    },
++	    {
++		xtype: 'textfield',
++		name: 'freenas_user',
++		reference: 'freenas_user_field',
++		inputId: 'freenas_user_field',
++		value: '',
++		fieldLabel: gettext('API Username'),
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++	    },
+ 	];
+ 
+ 	me.column2 = [
+@@ -49742,7 +49786,9 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'comstar_hg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
++		bind: {
++		    hidden: '{!isComstar}'
++		},
+ 		fieldLabel: gettext('Host group'),
+ 		allowBlank: true,
+ 	    },
+@@ -49750,9 +49796,62 @@
+ 		xtype: me.isCreate ? 'textfield' : 'displayfield',
+ 		name: 'lio_tpg',
+ 		value: '',
+-		bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
+-		allowBlank: false,
++		bind: {
++		    hidden: '{!isLIO}'
++		},
+ 		fieldLabel: gettext('Target portal group'),
++		allowBlank: true
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_apiv4_host',
++		reference: 'freenas_apiv4_host_field',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API IPv4 Host'),
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_password',
++		reference: 'freenas_password_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('API Password'),
++		change: function(f, value) {
++		    if (f.rendered) {
++			f.up().down('field[name=freenas_confirmpw]').validate();
++		    }
++		},
++	    },
++	    {
++		xtype: 'proxmoxtextfield',
++		name: 'freenas_confirmpw',
++		reference: 'freenas_confirmpw_field',
++		inputType: me.isCreate ? '' : 'password',
++		value: '',
++		editable: true,
++		submitValue: false,
++		emptyText: Proxmox.Utils.noneText,
++		bind: {
++		    hidden: '{!isFreeNAS}'
++		},
++		fieldLabel: gettext('Confirm Password'),
++		validator: function(value) {
++		    var pw = this.up().down('field[name=freenas_password]').getValue();
++		    if (pw !== value) {
++			return "Passwords do not match!";
++		    }
++		    return true;
++		},
+ 	    },
+ 	];
+