Set-Address documented

Documentation & fixes
New-Address documentation
2022-12-17 23:58:22 +03:00 · 2022-12-17 22:51:26 +03:00 · 2022-12-17 14:53:48 +03:00 · 2022-12-17 14:36:41 +03:00 · 2022-12-17 02:11:13 +03:00 · 2022-12-17 01:51:55 +03:00
56 changed files with 2133 additions and 717 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.dll
+bin
+obj
+.code-workspace
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@
  
 [![License](https://img.shields.io/badge/license-GPL2+-blue.svg)](https://git.arnike.ru/Arnike/ps.ipam/src/branch/main/LICENSE)
 ![Powershell](https://img.shields.io/badge/powershell-v5.1+-blue.svg)
+![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/ps.ipam)

  <h3 align="center">PS.IPAM</h3>

--- a/classlib/class/address.cs
+++ b/classlib/class/address.cs
@@ -0,0 +1,77 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Address {
+    public int Id { get; }
+    public int SubnetId { get; }
+    public string Ip { get; }
+    public bool IsGateway { get; }
+    public string Description { get; }
+    public string Hostname { get; }
+    public string MAC { get; }
+    public string Owner { get; }
+    public int TagId { get; }
+    public int DeviceId { get; }
+    public string Location { get; }
+    public string Port { get; }
+    public string Note { get; }
+    public DateTime? LastSeen { get; }
+    public bool ExcludePing { get; }
+    public bool PTRignore { get; }
+    public int PTR { get; }
+    public string FirewallAddressObject { get; }
+    public DateTime? EditDate { get; }
+    public int CustomerId { get; }
+    public Object? ExtendedData { get; }
+    
+    public Address(
+        int id,
+        int subnetId,
+        string ip,
+        bool is_gateway,
+        string description,
+        string hostname,
+        string mac,
+        string owner,
+        int tag,
+        int deviceId,
+        string location,
+        string port,
+        string note,
+        DateTime? lastSeen,
+        bool excludePing,
+        bool PTRignore,
+        int PTR,
+        string firewallAddressObject,
+        DateTime? editDate,
+        int customer_id,
+        Object? extendedData
+    ) {
+        this.Id                    = id;
+        this.SubnetId              = subnetId;
+        this.Ip                    = ip;
+        this.IsGateway             = is_gateway;
+        this.Description           = description;
+        this.Hostname              = hostname;
+        this.MAC                   = mac;
+        this.Owner                 = owner;
+        this.TagId                 = tag;
+        this.DeviceId              = deviceId;
+        this.Location              = location;
+        this.Port                  = port;
+        this.Note                  = note;
+        this.EditDate              = lastSeen;
+        this.ExcludePing           = excludePing;
+        this.PTRignore             = PTRignore;
+        this.PTR                   = PTR;
+        this.FirewallAddressObject = firewallAddressObject;
+        this.EditDate              = editDate;
+        this.CustomerId            = customer_id;
+        this.ExtendedData          = extendedData;
+    }
+
+    public override string ToString() {
+        return this.Ip;
+    }
+}
--- a/classlib/class/domain.cs
+++ b/classlib/class/domain.cs
@@ -0,0 +1,27 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Domain {
+    public int Id { get; }
+    public string Name { get; }
+    public string Description { get; }
+    public string Sections { get; }
+
+    public Domain (
+        int id,
+        string name,
+        string description,
+        string sections
+    ) {
+        this.Id          = id;
+        this.Name        = name;
+        this.Description = description;
+        this.Sections    = sections;
+    }
+
+    public override string ToString()
+    {
+        return this.Name;
+    }
+}
--- a/classlib/class/nameserver.cs
+++ b/classlib/class/nameserver.cs
@@ -0,0 +1,28 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Nameserver {
+    public int Id { get; }
+    public string Name { get; }
+    public string[] NameServers { get; }
+    public string Description { get; }
+    public string Permissions { get; }
+    public DateTime? EditDate { get; }
+
+    public Nameserver(
+        int id,
+        string name,
+        string nameServers,
+        string description,
+        string permissions,
+        DateTime? editDate
+    ) {
+        this.Id          = id;
+        this.Name        = name;
+        this.NameServers = nameServers.Split(new char[] {';'});
+        this.Description = description;
+        this.Permissions = permissions;
+        this.EditDate    = editDate;
+    }
+}
--- a/classlib/class/section.cs
+++ b/classlib/class/section.cs
@@ -0,0 +1,57 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Section {
+    public int Id { get; }
+    public string Name { get; }
+    public string Description { get; }
+    public int MasterSectionId { get; }
+    public string Permissions { get; }
+    public bool StrictMode { get; }
+    public string SubnetOrdering { get; }
+    public int Order { get; }
+    public DateTime? EditDate { get; }
+    public bool ShowSubnet { get; }
+    public bool ShowVlan { get; }
+    public bool ShowVRF { get; }
+    public bool ShowSupernetOnly { get; }
+    public int DNSId { get; }
+
+    public Section (
+        int id,
+        string name,
+        string description,
+        int masterSectionId,
+        string permissions,
+        bool strictMode,
+        string subnetOrdering,
+        int order,
+        DateTime? editDate,
+        bool showSubnet,
+        bool showVlan,
+        bool showVRF,
+        bool showSupernetOnly,
+        int dnsId
+    ) {
+        this.Id               = id;
+        this.Name             = name;
+        this.Description      = description;
+        this.MasterSectionId  = masterSectionId;
+        this.Permissions      = permissions;
+        this.StrictMode       = strictMode;
+        this.SubnetOrdering   = subnetOrdering;
+        this.Order            = order;
+        this.EditDate         = editDate;
+        this.ShowSubnet       = showSubnet;
+        this.ShowVlan         = showVlan;
+        this.ShowVRF          = showVRF;
+        this.ShowSupernetOnly = showSupernetOnly;
+        this.DNSId            = dnsId;
+    }
+
+    public override string ToString()
+    {
+        return this.Name;
+    }
+}
--- a/classlib/class/session.cs
+++ b/classlib/class/session.cs
@@ -0,0 +1,32 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Session {
+    public AuthType AuthType { get; }
+    public string Token { get; }
+    public string AppID { get; }
+    public string URL { get; }
+    public DateTime? Expires { get; }
+    public Object? Credentials { get; }
+    public Session(
+        AuthType authType,
+        string token,
+        string appId,
+        string url,
+        DateTime? expires,
+        Object? credentials
+    ) {
+        AuthType    = authType;
+        Token       = token;
+        AppID       = appId;
+        URL         = url;
+        Expires     = expires;
+        Credentials = credentials;
+    }
+
+    public override string ToString()
+    {
+        return base.ToString();
+    }
+}
--- a/classlib/class/subnet.cs
+++ b/classlib/class/subnet.cs
@@ -0,0 +1,114 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Subnetwork {
+    public int Id { get; }
+    public string Subnet { get; }
+    public int Mask { get; }
+    public int SectionId { get; }
+    public string Description { get; }
+    public string LinkedSubnet { get; }
+    public string FirewallAddressObject { get; }
+    public int VrfId { get; }
+    public int MasterSubnetId { get; }
+    public bool AllowRequests { get; }
+    public int VlanId { get; }
+    public bool ShowName { get; }
+    public int DeviceId { get; }
+    public string Permissions { get; }
+    public bool PingSubnet { get; }
+    public bool DiscoverSubnet { get; }
+    public bool ResolveDNS { get; }
+    public bool DNSRecursive { get; }
+    public bool DNSRecords { get; }
+    public int NameserverId { get; }
+    public bool ScanAgent { get; }
+    public bool IsFolder { get; }
+    public bool IsFull { get; }
+    public bool IsPool { get; }
+    public int TagId { get; }
+    public int Threshold { get; }
+    public int LocationId { get; }
+    public DateTime? EditDate { get; }
+    public DateTime? LastScan { get; }
+    public DateTime? LastDiscovery { get; }
+    public Object Calculation { get; }
+    public Object? ExtendedData { get; }
+    public Subnetwork(
+        int id,
+        string subnet,
+        int mask,
+        int sectionId,
+        string description,
+        string linkedSubnet,
+        string firewallAddressObject,
+        int vrfId,
+        int masterSubnetId,
+        bool allowRequests,
+        int vlanId,
+        bool showName,
+        int deviceId,
+        string permissions,
+        bool pingSubnet,
+        bool discoverSubnet,
+        bool resolveDNS,
+        bool dnsRecursive,
+        bool dnsRecords,
+        int nameserverId,
+        bool scanAgent,
+        bool isFolder,
+        bool isFull,
+        bool isPool,
+        int tagId,
+        int threshold,
+        int locationId,
+        DateTime? editDate,
+        DateTime? lastScan,
+        DateTime? lastDiscovery,
+        Object calculation,
+        Object? custom_fields
+    ) {
+        this.Id                    = id;
+        this.Subnet                = subnet;
+        this.Mask                  = mask;
+        this.SectionId             = sectionId;
+        this.Description           = description;
+        this.LinkedSubnet          = linkedSubnet;
+        this.FirewallAddressObject = firewallAddressObject;
+        this.VrfId                 = vrfId;
+        this.MasterSubnetId        = masterSubnetId;
+        this.AllowRequests         = allowRequests;
+        this.VlanId                = vlanId;
+        this.ShowName              = showName;
+        this.DeviceId              = deviceId;
+        this.Permissions           = permissions;
+        this.PingSubnet            = pingSubnet;
+        this.DiscoverSubnet        = discoverSubnet;
+        this.ResolveDNS            = resolveDNS;
+        this.DNSRecursive          = dnsRecursive;
+        this.DNSRecords            = dnsRecords;
+        this.NameserverId          = nameserverId;
+        this.ScanAgent             = scanAgent;
+        this.IsFolder              = isFolder;
+        this.IsFull                = isFull;
+        this.IsPool                = isPool;
+        this.TagId                 = tagId;
+        this.Threshold             = threshold;
+        this.LocationId            = locationId;
+        this.EditDate              = editDate;
+        this.LastScan              = lastScan;
+        this.LastDiscovery         = lastDiscovery;
+        this.Calculation           = calculation;
+        this.ExtendedData          = custom_fields;
+    }
+
+    public string GetCIDR() {
+        return $"{this.Subnet}/{this.Mask}";
+    }
+
+    public override string ToString()
+    {
+        return this.GetCIDR();
+    }
+}
--- a/classlib/class/tag.cs
+++ b/classlib/class/tag.cs
@@ -0,0 +1,45 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Tag {
+    public int Id { get; }
+    public string Type { get; }
+    public bool ShowTag { get; }
+    public string BGColor { get; }
+    public string FGColor { get; }
+    public bool Compress { get; }
+    public bool Locked { get; }
+    public bool UpdateTag { get; }
+
+    public Tag(
+        int id,
+        string type,
+        bool showTag,
+        string BGColor,
+        string FGColor,
+        string compress,
+        string locked,
+        bool updateTag
+    ) {
+        this.Id        = id;
+        this.Type      = type;
+        this.ShowTag   = showTag;
+        this.BGColor   = BGColor;
+        this.FGColor   = FGColor;
+        this.Compress  = this.StringToBool(compress);
+        this.Locked    = this.StringToBool(locked);
+        this.UpdateTag = updateTag;
+    }
+
+    public override string ToString() {
+        return this.Type;
+    }
+
+    private bool StringToBool(string str) {
+        if (str == "Yes") {
+            return true;
+        }
+        return false;
+    }
+}
--- a/classlib/class/vlan.cs
+++ b/classlib/class/vlan.cs
@@ -0,0 +1,39 @@
+namespace PS.IPAM;
+using System;
+using System.Dynamic;
+
+[Serializable]
+public class Vlan : DynamicObject {
+    public int Id { get; }
+    public int DomainId { get; }
+    public string Name { get; }
+    public int Number { get; }
+    public string Description { get; }
+    public DateTime? EditDate { get; }
+    public int CustomerId { get; }
+    public Object? ExtendedData { get; }
+    public Vlan (
+        int vlanId,
+        int domainId,
+        string name,
+        int number,
+        string description,
+        DateTime? editDate,
+        int customer_id,
+        Object? custom_fields
+    ) {
+        this.Id           = vlanId;
+        this.DomainId     = domainId;
+        this.Name         = name;
+        this.Number       = number;
+        this.Description  = description;
+        this.EditDate     = editDate;
+        this.CustomerId   = customer_id;
+        this.ExtendedData = custom_fields;
+    }
+
+    public override string ToString()
+    {
+        return $"{this.Number}";
+    }
+}
--- a/classlib/class/vrf.cs
+++ b/classlib/class/vrf.cs
@@ -0,0 +1,35 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public class Vrf {
+    public int Id { get; }
+    public string Name { get; }
+    public string RouteDistinguisher { get; }
+    public string Description { get; }
+    public string Sections { get; }
+    public DateTime? EditDate { get; }
+    public Object? ExtendedData { get; }
+
+    public Vrf(
+        int id,
+        string name,
+        string rd,
+        string description,
+        string sections,
+        DateTime? editDate,
+        Object? custom_fields
+    ) {
+        this.Id                 = id;
+        this.Name               = name;
+        this.RouteDistinguisher = rd;
+        this.Description        = description;
+        this.Sections           = sections;
+        this.EditDate           = editDate;
+        this.ExtendedData       = custom_fields;
+    }
+    public override string ToString()
+    {
+        return this.Name;
+    }
+}
--- a/classlib/classlib.csproj
+++ b/classlib/classlib.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+</Project>
--- a/classlib/enum/authType.cs
+++ b/classlib/enum/authType.cs
@@ -0,0 +1,8 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public enum AuthType {
+    credentials,
+    token
+}
--- a/classlib/enum/controllers.cs
+++ b/classlib/enum/controllers.cs
@@ -0,0 +1,14 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public enum controllers {
+    user,
+    vlan,
+    subnets,
+    addresses,
+    sections,
+    vrf,
+    l2domains,
+    tools
+}
--- a/classlib/enum/subcontrollers.cs
+++ b/classlib/enum/subcontrollers.cs
@@ -0,0 +1,16 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public enum subcontrollers {
+    nameservers,
+    tags,
+    devices,
+    device_types,
+    vlans,
+    vrfs,
+    scanagents,
+    locations,
+    nat,
+    racks
+}
--- a/classlib/enum/types.cs
+++ b/classlib/enum/types.cs
@@ -0,0 +1,14 @@
+namespace PS.IPAM;
+using System;
+
+[Serializable]
+public enum types {
+    Address,
+    Domain,
+    Section,
+    Subnetwork,
+    Nameserver,
+    Tag,
+    Vlan,
+    Vrf
+}
--- a/functions/private/ConvertTo-Hashtable.ps1
+++ b/functions/private/ConvertTo-Hashtable.ps1
@@ -0,0 +1,21 @@
+function ConvertTo-Hashtable {
+    [CmdletBinding()]
+    param (
+        [Parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PSCustomObject]$InputObject
+    )
+    process {
+        $_hashtable = @{}
+        $InputObject | Get-Member -MemberType *Property | Where-Object {
+            $_hashtable.($_.name) = $CustomFields.($_.name)
+        }
+
+        Write-Output $_hashtable
+    }
+}
--- a/functions/private/Invoke-PSIPAMRequest.ps1
+++ b/functions/private/Invoke-PSIPAMRequest.ps1
@@ -1,64 +0,0 @@
-function Invoke-PSIPAMRequest {
-    [CmdletBinding()]
-    param (
-        [parameter(Mandatory=$true)]
-        [ValidateSet("POST","GET","PATCH","DELETE")]
-        [string]
-        $Method,
-        [parameter(Mandatory=$true)]
-        [ValidateSet("user","vlan","subnets","addresses","sections","vrf","l2domains","tools")]
-        [string]
-        $Controller,
-        [parameter(Mandatory=$false)]
-        [ValidateSet("nameservers")]
-        [string]
-        $SubController,
-        [Parameter(Mandatory=$false)]
-        [ValidateScript({ $_ -is [Hashtable] -or $_ -is [PSCustomObject] })]
-        $Params,
-        [Parameter(Mandatory=$false)]
-        [array]
-        $Identifiers
-    )
-    $_tokenStatus = Test-PSIPAMSession
-
-    if ($_tokenStatus -eq "NoToken") { throw "No session available!" }
-    if ($_tokenStatus -eq "Expired") { Update-PSIPAMSession }
-
-    $Controller = $Controller.ToLower()
-
-    $_uri = "$($script:ipamURL)/api/$($script:ipamAppID)/$Controller"
-    if ($SubController) { $_uri += "/$SubController"  }
-    if ($Identifiers)   { $_uri += "/$($Identifiers -join '/')/" }
-    
-    $_headers  = @{
-        "Accept"        = "application/json"
-        "Content-Type"  = "application/json"
-        "token"         = $script:ipamToken
-    }
-
-    $_arguments = @{
-        Method  = $Method
-        Uri     = $_uri
-        Headers = $_headers
-    }
-    
-    if ($Method -match "POST|PATCH") {
-        if ($Params -is [PSCustomObject]) {
-            $_params = @{};
-            $Params | Get-Member -MemberType *Property | Where-Object {
-                $_params.($_.name) = $Params.($_.name)
-            }
-        } else { $_params = $Params }
-
-        $_arguments.Add("Body",($_params | ConvertTo-Json))
-    }
-
-    $_response  = Invoke-RestMethod @_arguments
-
-    if ($_response.code -match "20\d") {
-        return $_response.data
-    } else {
-        throw ("Error - $($_response.code)")
-    }
-}
--- a/functions/private/Invoke-Request.ps1
+++ b/functions/private/Invoke-Request.ps1
@@ -0,0 +1,103 @@
+function Invoke-Request {
+    [CmdletBinding()]
+    param (
+        [parameter(Mandatory=$true)]
+        [ValidateSet("GET","POST","PATCH","DELETE")]
+        [string]
+        $Method,
+        [parameter(Mandatory=$true)]
+        [PS.IPAM.controllers]
+        $Controller,
+        [parameter(Mandatory=$false)]
+        [PS.IPAM.types]
+        $Type,
+        [parameter(Mandatory=$false)]
+        [PS.IPAM.subcontrollers]
+        $SubController,
+        [Parameter(Mandatory=$false)]
+        [ValidateScript({ $_ -is [Hashtable] -or $_ -is [PSCustomObject] })]
+        $Params,
+        [Parameter(Mandatory=$false)]
+        [array]
+        $Identifiers
+    )
+    $_tokenStatus = Test-Session
+
+    if ($_tokenStatus -eq "NoToken") { throw "No session available!" }
+    if ($_tokenStatus -eq "Expired") { Update-Session }
+
+    $_uri = "$($script:psipamSession.URL)/api/$($script:psipamSession.AppID)/$Controller"
+    if ($null -ne $SubController) { $_uri += "/$SubController"  }
+    if ($null -ne $Identifiers)   { $_uri += "/$($Identifiers -join '/')/" }
+    
+    $_headers  = @{ }
+    switch ($script:psipamSession.AuthType) {
+        "Credentials" { $_headers.Add("token", $script:psipamSession.Token) }
+        "Token"       { $_headers.Add("phpipam-token", $script:psipamSession.Token) }
+    }
+
+    $_arguments = @{
+        Method      = $Method
+        Uri         = $_uri
+        Headers     = $_headers
+        ContentType = "application/json"
+    }
+    
+    if ($Method -eq "POST" -or $Method -eq "PATCH") {
+        if ($Params -is [PSCustomObject]) {
+            $_params = @{};
+            $Params | Get-Member -MemberType *Property | Where-Object {
+                $_params.($_.name) = $Params.($_.name)
+            }
+        } else { $_params = $Params }
+
+        $_arguments.Add("Body",($_params | ConvertTo-Json))
+    }
+
+    Write-Verbose -Message "Invoking web request to $($_uri), with method $($_arguments.Method), headers: $($_arguments.Headers)"
+
+    try {
+        $_response  = Invoke-RestMethod @_arguments
+    }
+    catch [System.Net.WebException] {
+        switch ($_.Exception.Message) {
+            "The remote server returned an error: (404) Not Found."   { Write-Verbose -Message "Not found." }
+            "The remote server returned an error: (400) Bad Request." { Write-Warning -Message "Bad Request." }
+            Default { Write-Verbose -Message "Error occured while requesting api" }
+        }
+    }
+    if (!$_response) { return $null }
+        
+    if ($Type -is [PS.IPAM.types]) {
+        switch ($Type) {
+            "address" {
+                $_paramList = @("id","subnetId","ip","is_gateway","description","hostname","mac","owner","tag","deviceId","location","port","note","lastSeen","excludePing","PTRignore","PTR","firewallAddressObject","editDate","customer_id")
+
+                $_response.data | ForEach-Object {
+                    New-Object -TypeName ([PS.IPAM.Address]) -ArgumentList (@(($_ | Select-Object $_paramList).psobject.properties.value) + ($_ | Select-Object -Property custom_* -ExcludeProperty 'custom_\*'))
+                }
+            }
+            "vlan" {
+                $_paramList = @("vlanId","domainId","name","number","description","editDate","customer_id","custom_fields")
+
+                $_response.data | ForEach-Object {
+                    New-Object -TypeName ([PS.IPAM.Vlan]) -ArgumentList (@(($_ | Select-Object $_paramList).psobject.properties.value) + ($_ | Select-Object -Property custom_* -ExcludeProperty 'custom_\*'))
+                }
+            }
+            "subnetwork" {
+                $_response.data | ForEach-Object {
+                    New-Object -TypeName ([PS.IPAM.Subnetwork]) -ArgumentList (@($_.psobject.properties.value[0..30]) + ($_ | Select-Object -Property custom_* -ExcludeProperty 'custom_\*'))
+                }
+            }
+            "vrf" {
+                $_response.data | ForEach-Object {
+                    New-Object -TypeName ([PS.IPAM.Vrf]) -ArgumentList (@($_.psobject.properties.value[0..5]) + ($_ | Select-Object -Property custom_* -ExcludeProperty 'custom_\*'))
+                }
+            }
+            Default { $_response.data | ForEach-Object { New-Object -TypeName ("PS.IPAM.$Type") -ArgumentList $_.psobject.properties.value } }
+        }
+
+    } else {
+        $_response.data
+    }
+}
--- a/functions/private/Test-PSIPAMSession.ps1
+++ b/functions/private/Test-PSIPAMSession.ps1
@@ -1,15 +0,0 @@
-function Test-PSIPAMSession {
-    [CmdletBinding()]
-    param (
-        
-    )
-    if ($script:ipamToken) {
-        if ($script:ipamExpires -lt (Get-Date)) {
-            return "Expired"
-        } else {
-            return "Valid"
-        }
-    } else {
-        return "NoToken"
-    }
-}
--- a/functions/private/Test-Session.ps1
+++ b/functions/private/Test-Session.ps1
@@ -0,0 +1,19 @@
+function Test-Session {
+    [CmdletBinding()]
+    param (
+        
+    )
+    if ($script:psipamSession) {
+        if ($null -eq $script:psipamSession.Expires) {
+            return "Valid"
+        } else {
+            if ($script:psipamSession.Expires -lt (Get-Date)) {
+                return "Expired"
+            } else {
+                return "Valid"
+            }
+        }
+    } else {
+        return "NoToken"
+    }
+}
--- a/functions/private/Update-PSIPAMSession.ps1
+++ b/functions/private/Update-PSIPAMSession.ps1
@@ -1,18 +0,0 @@
-function Update-PSIPAMSession {
-    [CmdletBinding()]
-    param (
-        [switch]
-        $Force
-    )
-    $_tokenStatus = Test-PSIPAMSession
-    if ($_tokenStatus -eq "NoToken") {
-        throw "No session available!"
-    }
-    if ($_tokenStatus -eq "Valid") {
-        return (Invoke-PSIPAMRequest -Method PATCH -Controller user).expires
-    }
-    if ($_tokenStatus -eq "Expired" -or $Force) {
-        New-PSIPAMSession -URL $script:ipamURL -AppID $script:ipamAppID -Credentials $script:ipamCredentials
-        return $script:ipamExpires
-    }
-}
--- a/functions/private/Update-Session.ps1
+++ b/functions/private/Update-Session.ps1
@@ -0,0 +1,18 @@
+function Update-Session {
+    [CmdletBinding()]
+    param (
+        [switch]
+        $Force
+    )
+    $_tokenStatus = Test-Session
+    if ($_tokenStatus -eq "NoToken") {
+        throw "No session available!"
+    }
+    if ($_tokenStatus -eq "Valid") {
+        return (Invoke-Request -Method [ps.ipam.methods]::PATCH -Controller [ps.ipam.controllers]::user).expires
+    }
+    if ($_tokenStatus -eq "Expired" -or $Force) {
+        New-Session -URL $script:psipamSession.URL -AppID $script:psipamSession.AppID -Credentials $script:psipamSession.Credentials
+        return
+    }
+}
--- a/functions/public/Assign-Tag.ps1
+++ b/functions/public/Assign-Tag.ps1
@@ -0,0 +1,49 @@
+function Assign-Tag {
+    <#
+        .SYNOPSIS
+
+        Assign tag to address.
+
+        .PARAMETER Tag
+        Tag object to assign.
+    #>
+    [CmdletBinding()]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Address]
+        $AddressObject,
+        [parameter(
+            Mandatory=$true,
+            Position=1
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Tag]
+        $Tag
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::addresses
+            Method     = "PATCH"
+        }
+        $_id = $AddressObject.id
+        $_tagid = $Tag.id
+        
+        $_identifiers = @($_id)
+
+        $_params.Add("Identifiers",$_identifiers)
+
+        $_body = @{ }
+        $_body.Add("tag", $_tagid)
+
+        $_params.Add("Params",$_body)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Assign-Tag
--- a/functions/public/Close-Session.ps1
+++ b/functions/public/Close-Session.ps1
@@ -0,0 +1,20 @@
+function Close-Session {
+    <#
+        .SYNOPSIS
+
+        Removes (revokes) token.
+    #>
+    [CmdletBinding()]
+    param()
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::user
+            Method     = "DELETE"
+        }
+
+        Invoke-Request @_params
+
+        $script:psipamSession = $null
+    }
+}
+Export-ModuleMember Close-Session
--- a/functions/public/Get-Address.ps1
+++ b/functions/public/Get-Address.ps1
@@ -0,0 +1,124 @@
+function Get-Address {
+    <#
+        .SYNOPSIS
+        
+        Returns address object.
+    #>
+    [CmdletBinding(DefaultParameterSetName="ByID")]
+    [OutputType([PS.IPAM.address])]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByIP"
+        )]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=1,
+            ParameterSetName="BySubnetId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [ipaddress]
+        $IP,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByHostName"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $HostName,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByHostBase"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $HostBase,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByTag"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $TagId,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySubnetId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $SubnetId,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySubnetCIDR"
+        )]
+        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $SubnetCIDR
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::addresses
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::address
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"          { $_identifiers = @($id); break }
+            "ByIP"          { $_identifiers = ("search",$IP); break }
+            "ByHostName"    { $_identifiers = ("search_hostname",$HostName); break }
+            "ByHostBase"    { $_identifiers = ("search_hostbase",$HostBase); break }
+            "ByTag"         { $_identifiers = ("tags",$TagId,[PS.IPAM.controllers]::addresses); break }
+            "BySubnetId"    {
+                if ($IP) {
+                    $_identifiers = ($IP,$SubnetId)
+                } else {
+                    $_params.Item("Controller") = [PS.IPAM.controllers]::subnets
+                    $_identifiers = ($SubnetId,[PS.IPAM.controllers]::addresses)
+                }
+                break
+            }
+            "BySubnetCIDR"  {
+                $_params.Item("Controller") = [PS.IPAM.controllers]::subnets
+                $_subnetId = (Get-Subnet -CIDR $SubnetCIDR).id
+                if (!$_subnetId) { throw "Cannot find subnet!" }
+
+                $_identifiers = ($_subnetId,[PS.IPAM.controllers]::addresses)
+                break
+            }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-Address
--- a/functions/public/Get-FirstFreeIP.ps1
+++ b/functions/public/Get-FirstFreeIP.ps1
@@ -0,0 +1,56 @@
+function Get-FirstFreeIP {
+    [CmdletBinding(DefaultParameterSetName="ByID")]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByCIDR"
+        )]
+        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $CIDR,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySubnetObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Subnetwork]
+        $SubnetObject
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::subnets
+            Method     = "GET"
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"      { $_subnetId = $Id; break }
+            "ByCIDR"    {
+                $_subnetId = (Get-Subnet -CIDR $CIDR).id
+                if (!$_subnetId) { throw "Cannot find subnet!" }
+                break
+            }
+            "BySubnetObject" { $_subnetId = $SubnetObject.Id; break }
+        }
+        $_identifiers = @($_subnetId,"first_free")
+        $_params.Add("Identifiers",$_identifiers)
+
+        return Invoke-Request @_params | Select-Object @{n="Ip";e={$_}}
+    }
+}
+Export-ModuleMember -Function Get-FirstFreeIP
--- a/functions/public/Get-L2Domain.ps1
+++ b/functions/public/Get-L2Domain.ps1
@@ -0,0 +1,29 @@
+function Get-L2Domain {
+    [CmdletBinding(DefaultParameterSetName="ByID")]
+    [OutputType([PS.IPAM.Domain])]
+    param (
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::l2domains
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::Domain
+        }
+        
+        $_identifiers = @($Id)
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-L2Domain
--- a/functions/public/Get-Nameserver.ps1
+++ b/functions/public/Get-Nameserver.ps1
@@ -0,0 +1,31 @@
+function Get-Nameserver {
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id
+    )
+    process {
+        $_params = @{
+            Controller    = [PS.IPAM.controllers]::tools
+            SubController = [PS.IPAM.subcontrollers]::nameservers
+            Method        = "GET"
+            Type          = [PS.IPAM.types]::nameserver
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"      { $_nameserverId = $Id; break }
+        }
+        $_identifiers = @($_nameserverId)
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-Nameserver
--- a/functions/public/Get-PSIPAMFirstFreeIP.ps1
+++ b/functions/public/Get-PSIPAMFirstFreeIP.ps1
@@ -1,33 +0,0 @@
-function Get-PSIPAMFirstFreeIP {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByCIDR")]
-        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $CIDR,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        $_params = @{
-            Controller = "subnets"
-            Method     = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"      { $_subnetId = $Id }
-            "ByCIDR"    {
-                $_subnetId = (Get-PSIPAMSubnet -CIDR $CIDR).id
-                if (!$_subnetId) { throw "Cannot find subnet!" }
-            }
-        }
-        $_identifiers = @($_subnetId,"first_free")
-        $_params.Add("Identifiers",$_identifiers)
-
-        return Invoke-PSIPAMRequest @_params | Select-Object @{n="Ip";e={$_}}
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMFirstFreeIP
--- a/functions/public/Get-PSIPAML2Domain.ps1
+++ b/functions/public/Get-PSIPAML2Domain.ps1
@@ -1,26 +0,0 @@
-function Get-PSIPAML2Domain {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "l2domains"
-            Method     = "GET"
-        }
-        $_identifiers = @($Id)
-        
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember -Function Get-PSIPAML2Domain
--- a/functions/public/Get-PSIPAMNameserver.ps1
+++ b/functions/public/Get-PSIPAMNameserver.ps1
@@ -1,29 +0,0 @@
-function Get-PSIPAMNameserver {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name','Address','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller    = "tools"
-            SubController = "nameservers"
-            Method        = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"      { $_nameserverId = $Id }
-        }
-        $_identifiers = @($_nameserverId)
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | Select-Object  @{n="address";e={$_.namesrv1}},* | Select-Object -ExcludeProperty namesrv1 | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMNameserver
--- a/functions/public/Get-PSIPAMSection.ps1
+++ b/functions/public/Get-PSIPAMSection.ps1
@@ -1,32 +0,0 @@
-function Get-PSIPAMSection {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,Position=0,ParameterSetName="ByName")]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Name
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "sections"
-            Method     = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"      { $_identifiers = @($Id) }
-            "ByName"    { $_identifiers = @($Name) }
-        }
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember Get-PSIPAMSection
--- a/functions/public/Get-PSIPAMSubnet.ps1
+++ b/functions/public/Get-PSIPAMSubnet.ps1
@@ -1,129 +0,0 @@
-function Get-PSIPAMSubnet {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByCIDR")]
-        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $CIDR,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="BySectionId")]
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=2,ParameterSetName="ByVlanNumber")]
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=1,ParameterSetName="ByVlanId")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $SectionId,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="BySectionName")]
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=3,ParameterSetName="ByVlanNumber")]
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=2,ParameterSetName="ByVlanId")]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $SectionName,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByVrfId")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $VrfId,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByVlanId")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $VlanId,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByVlanNumber")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $VlanNumber,
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=1,ParameterSetName="ByVlanNumber")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $VlanDomain,
-        [parameter(Mandatory=$false,ParameterSetName="ByID")]
-        [switch]
-        $Slaves,
-        [parameter(Mandatory=$false,ParameterSetName="ByID")]
-        [switch]
-        $Recurse
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Subnet','Mask','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "subnets"
-            Method     = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByCIDR"    {
-                $_identifiers = @("cidr",$CIDR)
-            }
-            "ByID"      {
-                $_identifiers = @($Id)
-
-                if ($Slaves) {
-                    if ($Recurse) {
-                        $_identifiers += "slaves_recursive"
-                    } else {
-                        $_identifiers += "slaves"
-                    }
-                }
-            }
-            "BySectionId" {
-                $_params.Item("Controller") = "sections"
-                $_sectionId = $SectionId
-
-                $_identifiers = @($_sectionId,"subnets") 
-            }
-            "BySectionName" {
-                $_params.Item("Controller") = "sections"
-                $_sectionId = (Get-PSIPAMSection -Name $SectionName).id
-                if (!$_sectionId) { throw "Cannot find section!" }
-
-                $_identifiers = @($_sectionId,"subnets") 
-            }
-            "ByVrfId"   {
-                $_params.Item("Controller") = "vrf"
-                $_vrfId = $VrfId
-
-                $_identifiers = @($_vrfId,"subnets")
-            }
-            "ByVlanId" {
-                $_params.Item("Controller") = "vlan"
-                $_vlanId = $VlanId
-                if ($SectionId)  { $_sectionId = $SectionId }
-                if ($SectionName){ $_sectionId = (Get-PSIPAMSection -Name $SectionName).id }
-
-                $_identifiers = @($_vlanId,"subnets")
-
-                if ($_sectionId) { $_identifiers += $_sectionId }
-            }
-            "ByVlanNumber" {
-                $_params.Item("Controller") = "vlan"
-                $_vlans = Get-PSIPAMVlan -Number $VlanNumber
-                if ($VlanDomain) { $_vlans = $_vlans | Where-Object {$_.domainId -eq $VlanDomain} }
-                if ($SectionId)  { $_sectionId = $SectionId }
-                if ($SectionName){ $_sectionId = (Get-PSIPAMSection -Name $SectionName).id }
-
-                $_vlanId = $_vlans.vlanId
-
-                if ($_vlanid -is [System.Array]) { throw "More than one vLan with $VlanNumber number is present!" }
-                if (!$_vlanId) { throw "Cannot find Vlan!"}
-
-                $_identifiers = @($_vlanId,"subnets")
-
-                if ($_sectionId) { $_identifiers += $_sectionId }
-            }
-        }
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember Get-PSIPAMSubnet
--- a/functions/public/Get-PSIPAMSubnetUsage.ps1
+++ b/functions/public/Get-PSIPAMSubnetUsage.ps1
@@ -1,33 +0,0 @@
-function Get-PSIPAMSubnetUsage {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByCIDR")]
-        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $CIDR,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        $_params = @{
-            Controller = "subnets"
-            Method     = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByCIDR"    {
-                $_subnetId = (Get-PSIPAMSubnet -CIDR $CIDR).id
-                if (!$_subnetId) { throw "Cannot find subnet!" }
-            }
-            "ByID"      { $_subnetId = $Id }
-        }
-        $_identifiers = @($_subnetId,"usage")
-        $_params.Add("Identifiers",$_identifiers)
-
-        return Invoke-PSIPAMRequest @_params
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMSubnetUsage
--- a/functions/public/Get-PSIPAMTags.ps1
+++ b/functions/public/Get-PSIPAMTags.ps1
@@ -1,26 +0,0 @@
-function Get-PSIPAMTags {
-    [CmdletBinding()]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "addresses"
-            Method     = "GET"
-        }
-        $_identifiers = @("tags")
-        if ($Id) { $_identifiers += $Id }
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMTags
--- a/functions/public/Get-PSIPAMVlan.ps1
+++ b/functions/public/Get-PSIPAMVlan.ps1
@@ -1,45 +0,0 @@
-function Get-PSIPAMVlan {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByNumber")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Number,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByL2Domain")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $L2DomainId
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "vlan"
-            Method     = "GET"
-        }
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"      { $_identifiers = @($Id) }
-            "ByNumber"  { $_identifiers = @("search",$Number) }
-            "ByL2Domain"{
-                $_params.Item("Controller") = "l2domains"
-
-                $_l2domainId = $L2DomainId
-
-                $_identifiers = @($_l2domainId,"vlans")
-            }
-        }
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params | Select-Object @{n="id";e={$_.vlanId}},* | Select-Object -ExcludeProperty vlanId | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMVlan
--- a/functions/public/Get-PSIPAMVrf.ps1
+++ b/functions/public/Get-PSIPAMVrf.ps1
@@ -1,26 +0,0 @@
-function Get-PSIPAMVrf {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id
-    )
-    process {
-        [string[]]$visiblePropertiesList = @('Id','Name','Description')
-        $visibleProperties = [System.Management.Automation.PSPropertySet]::new('DefaultDisplayPropertySet',$visiblePropertiesList)
-
-        $_params = @{
-            Controller = "vrf"
-            Method     = "GET"
-        }
-        if ($Id) { $_identifiers = @($Id) }
-
-        $_params.Add("Identifiers",$_identifiers) 
-
-        Invoke-PSIPAMRequest @_params | Select-Object @{n="id";e={$_.vrfId}},* | Select-Object -ExcludeProperty vrfId | `
-            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
-    }
-}
-Export-ModuleMember -Function Get-PSIPAMVrf
--- a/functions/public/Get-PSIPAMAddress.ps1
+++ b/functions/public/Get-PSIPAMAddress.ps1
@@ -1,5 +1,5 @@
-function Get-PSIPAMAddress {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
+function Get-Permissions {
+    [CmdletBinding()]
    param (
        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0,ParameterSetName="ByID")]
        [ValidateScript({ $_ -match "^\d+$" })]
@@ -41,10 +41,10 @@ function Get-PSIPAMAddress {
            Method     = "GET"
        }
        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"          { $_identifiers = @($id) }
-            "ByIP"          { $_identifiers = ("search",$IP) }
-            "ByHostName"    { $_identifiers = ("search_hostname",$HostName) }
-            "ByTag"         { $_identifiers = ("tags",$TagId,"addresses") }
+            "ByID"          { $_identifiers = @($id); break }
+            "ByIP"          { $_identifiers = ("search",$IP); break }
+            "ByHostName"    { $_identifiers = ("search_hostname",$HostName); break }
+            "ByTag"         { $_identifiers = ("tags",$TagId,"addresses"); break }
            "BySubnetId"    {
                if ($IP) {
                    $_identifiers = ($IP,$SubnetId)
@@ -52,19 +52,21 @@ function Get-PSIPAMAddress {
                    $_params.Item("Controller") = "subnets"
                    $_identifiers = ($SubnetId,"addresses")
                }
+                break
            }
            "BySubnetCIDR"  {
                $_params.Item("Controller") = "subnets"
-                $_subnetId = (Get-PSIPAMSubnet -CIDR $SubnetCIDR).id
+                $_subnetId = (Get-Subnet -CIDR $SubnetCIDR).id
                if (!$_subnetId) { throw "Cannot find subnet!" }

                $_identifiers = ($_subnetId,"addresses")
+                break
            }
        }
        $_params.Add("Identifiers",$_identifiers)

-        Invoke-PSIPAMRequest @_params | `
+        Invoke-Request @_params | `
            Add-Member -MemberType MemberSet -Name PSStandardMembers -Value $visibleProperties -PassThru
    }
 }
-Export-ModuleMember -Function Get-PSIPAMAddress
+Export-ModuleMember -Function Get-Permissions
--- a/functions/public/Get-Section.ps1
+++ b/functions/public/Get-Section.ps1
@@ -0,0 +1,39 @@
+function Get-Section {
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    [OutputType([PS.IPAM.Section])]
+    param (
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            Position=0,
+            ParameterSetName="ByName"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Name
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::sections
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::Section
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"      { $_identifiers = @($Id); break }
+            "ByName"    { $_identifiers = @($Name); break }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember Get-Section
--- a/functions/public/Get-Subnet.ps1
+++ b/functions/public/Get-Subnet.ps1
@@ -0,0 +1,211 @@
+function Get-Subnet {
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    [OutputType([PS.IPAM.Subnetwork])]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByCIDR"
+        )]
+        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $CIDR,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySectionId"
+        )]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=2,
+            ParameterSetName="ByVlanNumber"
+        )]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=1,
+            ParameterSetName="ByVlanId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $SectionId,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySectionName"
+        )]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=3,
+            ParameterSetName="ByVlanNumber"
+        )]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=2,
+            ParameterSetName="ByVlanId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $SectionName,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByVrfId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $VrfId,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByVlanId"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $VlanId,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByVlanNumber"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $VlanNumber,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=1,
+            ParameterSetName="ByVlanNumber"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $VlanDomainId,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=1,
+            ParameterSetName="ByID"
+        )]
+        [switch]
+        $Slaves,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=2,
+            ParameterSetName="ByID"
+        )]
+        [switch]
+        $Recurse
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::subnets
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::Subnetwork
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByCIDR"    {
+                $_identifiers = @("cidr",$CIDR); break
+            }
+            "ByID"      {
+                $_identifiers = @($Id)
+
+                if ($Slaves) {
+                    if ($Recurse) {
+                        $_identifiers += "slaves_recursive"
+                    } else {
+                        $_identifiers += "slaves"
+                    }
+                }
+                break
+            }
+            "BySectionId" {
+                $_params.Item("Controller") = "sections"
+                $_sectionId = $SectionId
+
+                $_identifiers = @($_sectionId,"subnets")
+                break
+            }
+            "BySectionName" {
+                $_params.Item("Controller") = "sections"
+                $_sectionId = (Get-Section -Name $SectionName).id
+                if (!$_sectionId) { throw "Cannot find section!" }
+
+                $_identifiers = @($_sectionId,"subnets")
+                break
+            }
+            "ByVrfId"   {
+                $_params.Item("Controller") = "vrf"
+                $_vrfId = $VrfId
+
+                $_identifiers = @($_vrfId,"subnets")
+                break
+            }
+            "ByVlanId" {
+                $_params.Item("Controller") = "vlan"
+                $_vlanId = $VlanId
+                if ($SectionId)  { $_sectionId = $SectionId }
+                if ($SectionName){ $_sectionId = (Get-Section -Name $SectionName).id }
+
+                $_identifiers = @($_vlanId,"subnets")
+
+                if ($_sectionId) { $_identifiers += $_sectionId }
+                break
+            }
+            "ByVlanNumber" {
+                $_params.Item("Controller") = "vlan"
+                $_vlans = Get-Vlan -Number $VlanNumber
+                if ($VlanDomain) { $_vlans = $_vlans | Where-Object {$_.domainId -eq $VlanDomain} }
+                if ($SectionId)  { $_sectionId = $SectionId }
+                if ($SectionName){ $_sectionId = (Get-Section -Name $SectionName).id }
+
+                $_vlanId = $_vlans.vlanId
+
+                if ($_vlanid -is [System.Array]) { throw "More than one vLan with $VlanNumber number is present!" }
+                if (!$_vlanId) { throw "Cannot find Vlan!"}
+
+                $_identifiers = @($_vlanId,"subnets")
+
+                if ($_sectionId) { $_identifiers += $_sectionId }
+                break
+            }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember Get-Subnet
--- a/functions/public/Get-SubnetUsage.ps1
+++ b/functions/public/Get-SubnetUsage.ps1
@@ -0,0 +1,45 @@
+function Get-SubnetUsage {
+    [CmdletBinding(DefaultParameterSetName="ByID")]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByCIDR"
+        )]
+        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $CIDR,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id
+    )
+    process {
+        $_params = @{
+            Controller = [ps.ipam.controllers]::subnets
+            Method     = "GET"
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByCIDR"    {
+                $_subnetId = (Get-Subnet -CIDR $CIDR).id
+                if (!$_subnetId) { throw "Cannot find subnet!" }
+                break
+            }
+            "ByID"      { $_subnetId = $Id; break }
+        }
+        $_identifiers = @($_subnetId,"usage")
+        $_params.Add("Identifiers",$_identifiers)
+
+        return Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-SubnetUsage
--- a/functions/public/Get-Tag.ps1
+++ b/functions/public/Get-Tag.ps1
@@ -0,0 +1,76 @@
+function Get-Tag {
+    <#
+        .SYNOPSIS
+
+        Return address tag.
+
+        .DESCRIPTION
+
+        Return address tag by id, address object or subnetwork object. Or leave it empty at take all tags at once.
+    #>
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    [OutputType([PS.IPAM.Tag])]
+    param (
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByAddressObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Address]
+        $AddressObject,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySubnetObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Subnetwork]
+        $SubnetObject
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::addresses
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::tag
+        }
+        $_identifiers = @("tags")
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"            { $_identifiers += $Id; break  }
+            "ByAddressObject" { 
+                if ($AddressObject.TagId) {
+                    $_identifiers += $AddressObject.TagId
+                } else {
+                    return $null
+                }
+                break
+             }
+             "BySubnetObject" {
+                if ($SubnetObject.TagId) {
+                    $_identifiers += $SubnetObject.TagId
+                } else {
+                    return $null
+                }
+                break
+             }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-Tag
--- a/functions/public/Get-Vlan.ps1
+++ b/functions/public/Get-Vlan.ps1
@@ -0,0 +1,101 @@
+function Get-Vlan {
+    <#
+        .SYNOPSIS
+
+        Return vlan object.
+
+        .DESCRIPTION
+
+        Return vlan object by vlanId, vlan number, l2domainId (return all vlans in domain), subnet object or l2domain object
+
+        .PARAMETER Number
+        Vlan tag
+    #>
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    [OutputType([PS.IPAM.Vlan])]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByNumber"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Number,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByL2Domain"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $L2DomainId,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="BySubnetObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Subnetwork]
+        $SubnetObject,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByDomainObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Domain]
+        $DomainObject
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::vlan
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::Vlan
+        }
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"      { $_identifiers = @($Id); break }
+            "ByNumber"  { $_identifiers = @("search",$Number); break }
+            "ByL2Domain"{
+                $_params.Item("Controller") = [PS.IPAM.controllers]::l2domains
+
+                $_l2domainId = $L2DomainId
+
+                $_identifiers = @($_l2domainId,[PS.IPAM.subcontrollers]::vlans)
+                break
+            }
+            "BySubnetObject" {
+                if ($SubnetObject.VlanId) {
+                    $_identifiers = @($SubnetObject.VlanId); break
+                } else {
+                    return $null
+                }
+            }
+            "DomainObject" {
+                Get-Vlan -L2DomainId $DomainObject.Id
+            }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-Vlan
--- a/functions/public/Get-Vrf.ps1
+++ b/functions/public/Get-Vrf.ps1
@@ -0,0 +1,38 @@
+function Get-Vrf {
+    <#
+        .SYNOPSIS
+
+        Returns VRF object.
+
+        .DESCRIPTION
+
+        Returns VRF by id. Or leave it empty to get all VRFs.
+    #>
+    [CmdletBinding(DefaultParameterSetName="NoParams")]
+    [OutputType([PS.IPAM.Vrf])]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::vrf
+            Method     = "GET"
+            Type       = [PS.IPAM.types]::vrf
+        }
+        if ($Id) { $_identifiers = @($Id) }
+
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember -Function Get-Vrf
--- a/functions/public/New-PSIPAMAddress.ps1
+++ b/functions/public/New-PSIPAMAddress.ps1
@@ -1,21 +1,66 @@
-function New-PSIPAMAddress {
+function New-Address {
+    <#
+        .SYNOPSIS
+
+        Creates address object.
+
+        .PARAMETER SubnetId
+        Id of subnet address belongs to.
+
+        .PARAMETER Ip
+        IP address.
+
+        .PARAMETER Gateway
+        Defines if address is presented as gateway.
+
+        .PARAMETER Description
+        Address description.
+
+        .PARAMETER Hostname
+        Address hostname.
+
+        .PARAMETER MAC
+        Mac address.
+
+        .PARAMETER Owner
+        Address owner.
+
+        .PARAMETER TagId
+        Id of subnet address belongs to.
+
+        .PARAMETER PTRIgnore
+        Controls if PTR should not be created.
+
+        .PARAMETER PTRId
+        Id of PowerDNS PTR record.
+
+        .PARAMETER Note
+        Note.
+
+        .PARAMETER ExcludePing
+        Exclude this address from status update scans (ping).
+
+        .PARAMETER DeviceId
+        Id of device address belongs to.
+
+        .PARAMETER Port
+        Port.
+    #>
+    [OutputType([PS.IPAM.address])]
    [CmdletBinding()]
    param (
        [parameter(
            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of subnet address belongs to",
            Position=0)]
-        [ValidateScript({ $_ -match "^\d+$" })]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $SubnetId,
        [parameter(
            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="IP address",
            Position=1)]
        [ValidateScript({[ipaddress] $_ })]
        [ValidateNotNullOrEmpty()]
@@ -25,7 +70,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Defines if address is presented as gateway",
            Position=2)]
        [switch]
        $Gateway,
@@ -33,7 +77,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Address description",
            Position=3)]
        [ValidateNotNullOrEmpty()]
        [string]
@@ -42,7 +85,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Address hostname",
            Position=4)]
        [ValidateNotNullOrEmpty()]
        [string]
@@ -51,7 +93,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Mac address",
            Position=5)]
        [ValidateScript({ $_.Replace(":","") -match "^$('([A-F0-9]{2})' * 6)$" })]
        [ValidateNotNullOrEmpty()]
@@ -61,7 +102,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Address owner",
            Position=6)]
        [ValidateNotNullOrEmpty()]
        [string]
@@ -70,17 +110,14 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of subnet address belongs to",
            Position=7)]
-        [ValidateScript({ $_ -match "^\d+$" })]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $TagId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls if PTR should not be created",
            Position=8)]
        [switch]
        $PTRIgnore,
@@ -88,17 +125,14 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of PowerDNS PTR record",
            Position=7)]
-        [ValidateScript({ $_ -match "^\d+$" })]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $PTRId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Note",
            Position=10)]
        [ValidateNotNullOrEmpty()]
        [string]
@@ -107,7 +141,6 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Exclude this address from status update scans (ping)",
            Position=11)]
        [switch]
        $ExcludePing,
@@ -115,29 +148,30 @@ function New-PSIPAMAddress {
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of device address belongs to",
            Position=12)]
-        [ValidateScript({ $_ -match "^\d+$" })]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $DeviceId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Port",
            Position=13)]
        [ValidateNotNullOrEmpty()]
        [string]
        $Port,
-
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true)]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=14
+        )]
        [ValidateScript({ $_ -is [Hashtable] -or $_ -is [PSCustomObject] })]
        $CustomFields
    )
    process {
        $_params = @{
-            Controller = "addresses"
+            Controller = [PS.IPAM.controllers]::addresses
            Method     = "POST"
        }

@@ -160,10 +194,7 @@ function New-PSIPAMAddress {

        if ($CustomFields) {
            if ($CustomFields -is [PSCustomObject]) {
-                $_customFields = @{};
-                $CustomFields | Get-Member -MemberType *Property | Where-Object {
-                    $_customFields.($_.name) = $CustomFields.($_.name)
-                }
+                $_customFields = ConvertTo-Hashtable -InputObject $CustomFields
            } else { $_customFields = $CustomFields }
    
            $_body = $_body + $_customFields
@@ -171,12 +202,11 @@ function New-PSIPAMAddress {

        $_params.Add("Params",$_body)

-        try {
-            Invoke-PSIPAMRequest @_params
-        }
-        finally {
-            Get-PSIPAMAddress -SubnetId $SubnetId -Ip $Ip
+        $_result = Invoke-Request @_params
+
+        if ($_result) {
+            Get-Address -SubnetId $SubnetId -Ip $Ip
        }
    }
 }
-Export-ModuleMember -Function New-PSIPAMAddress
+Export-ModuleMember -Function New-Address
--- a/functions/public/New-PSIPAMFirstFreeIP.ps1
+++ b/functions/public/New-PSIPAMFirstFreeIP.ps1
@@ -1,4 +1,4 @@
-function New-PSIPAMFirstFreeIP {
+function New-FirstFreeIP {
    [CmdletBinding()]
    param (
        [parameter(
@@ -163,10 +163,10 @@ function New-PSIPAMFirstFreeIP {

        $_params.Add("Params",$_body)

-        $_result = Invoke-PSIPAMRequest @_params
+        $_result = Invoke-Request @_params
        if ($_result) {
-            Get-PSIPAMAddress -SubnetId $SubnetId -IP $_result
+            Get-Address -SubnetId $SubnetId -IP $_result
        }
    }
 }
-Export-ModuleMember -Function New-PSIPAMFirstFreeIP
+Export-ModuleMember -Function New-FirstFreeIP
--- a/functions/public/New-PSIPAMSession.ps1
+++ b/functions/public/New-PSIPAMSession.ps1
@@ -1,37 +0,0 @@
-function New-PSIPAMSession {
-    [CmdletBinding()]
-    param (
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=0)]
-        [ValidateNotNullOrEmpty()]
-        [string]$URL,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=1)]
-        [ValidateNotNullOrEmpty()]
-        [string]$AppID,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true,Position=2)]
-        [ValidateNotNullOrEmpty()]
-        [pscredential]$Credentials
-    )
-    $_bstr          = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($Credentials.Password)
-    $_password      = [System.Runtime.InteropServices.Marshal]::PtrToStringBSTR($_bstr)
-    $_uri           = "$URL/api/$AppID/user"
-    $_auth          = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("$($Credentials.UserName):$_password")) 
-    $_headers  = @{
-        "Accept"        = "application/json"
-        "Content-Type"  = "application/json"
-        "Authorization" = "Basic $_auth"
-    }
-
-    $_response  = Invoke-RestMethod -Method Post -Uri $_uri -Headers $_headers -ErrorAction SilentlyContinue
-
-    if ($_response.success -eq $true) {
-        $script:ipamAuth        = $true
-        $script:ipamToken       = $_response.data.token
-        $script:ipamAppID       = $AppID
-        $script:ipamURL         = $URL
-        $script:ipamCredentials = $Credentials
-        $script:ipamExpires     = Get-Date $_response.data.expires
-    } else {
-        $_response.error
-    }
-}
-Export-ModuleMember -Function New-PSIPAMSession
--- a/functions/public/New-Session.ps1
+++ b/functions/public/New-Session.ps1
@@ -0,0 +1,111 @@
+function New-Session {
+    <#
+        .SYNOPSIS
+
+        Creates new session to phpIPAM instance.
+
+        .DESCRIPTION
+
+        Creates new session to phpIPAM instance by provided credentials or token.
+
+        .PARAMETER URL
+        Base URL of phpIPAM instance.
+        Example - http://ipam.example.com
+
+        .PARAMETER AppID
+        API id (specified in phpIPAM api settings)
+
+        .PARAMETER Token
+        User token foor authorization
+
+        .PARAMETER IgnoreSSL
+        Ignore SSL errors
+
+        .OUTPUTS
+        None. New-Session does not generate any output.
+    #>
+    [CmdletBinding(DefaultParameterSetName="Credentials")]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0
+        )]
+        [ValidateNotNullOrEmpty()]
+        [validatescript({$_.startswith("http")})]
+        [string]$URL,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=1
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]$AppID,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=2,
+            ParameterSetName="Credentials"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [pscredential]$Credentials,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=2,
+            ParameterSetName="Token"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [string]$Token,
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=3
+        )]
+        [switch]$IgnoreSSL = $false
+    )
+    switch ($PSCmdlet.ParameterSetName) {
+        "Credentials" {
+            $_bstr          = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($Credentials.Password)
+            $_password      = [System.Runtime.InteropServices.Marshal]::PtrToStringBSTR($_bstr)
+            $_uri           = "$URL/api/$AppID/user"
+            $_auth          = [System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("$($Credentials.UserName):$_password")) 
+            $_headers  = @{
+                "Accept"        = "application/json"
+                "Content-Type"  = "application/json"
+                "Authorization" = "Basic $_auth"
+            }
+        
+            $_response  = Invoke-RestMethod -Method POST -Uri $_uri -Headers $_headers
+
+            if ($_response.success -ne $true) { return $_response.error }
+
+            $script:psipamSession = [PS.IPAM.Session]::new(
+                [ps.ipam.authType]::credentials,
+                $_response.data.token,
+                $AppID,
+                $URL,
+                (Get-Date $_response.data.expires),
+                $Credentials
+            )
+            break
+        }
+        "Token" {
+            $script:psipamSession = [PS.IPAM.Session]::new(
+                [ps.ipam.authType]::token,
+                $Token,
+                $AppID,
+                $URL,
+                $null,
+                $null
+            )
+            break
+        }
+    }
+}
+Export-ModuleMember -Function New-Session
--- a/functions/public/New-PSIPAMSubnet.ps1
+++ b/functions/public/New-PSIPAMSubnet.ps1
@@ -1,12 +1,69 @@
-function New-PSIPAMSubnet {
+function New-Subnet {
+    <#
+        .SYNOPSIS
+
+        Creates new subnetwork object.
+
+        .PARAMETER CIDR
+        CIDR of subnet in dotted format (e.g 10.10.10.0/24).
+
+        .PARAMETER SectionId
+        Section identifier.
+
+        .PARAMETER Description
+        Subnet description.
+
+        .PARAMETER VlanId
+        Assigns subnet to VLAN.
+
+        .PARAMETER VrfId
+        Assigns subnet to VRF.
+
+        .PARAMETER MasterSubnetId
+        Master subnet id for nested subnet.
+
+        .PARAMETER NameserverId
+        Id of nameserver to attach to subnet.
+
+        .PARAMETER ShowName
+        Controls weather subnet is displayed as IP address or Name in subnets menu.
+
+        .PARAMETER DNSRecursive
+        Controls if PTR records should be created for subnet.
+
+        .PARAMETER DNSRecords
+        Controls weather hostname DNS records are displayed.
+
+        .PARAMETER AllowRequests
+        Controls if IP requests are allowed for subnet.
+
+        .PARAMETER ScanAgentId
+        Controls which scanagent to use for subnet (default id 1).
+
+        .PARAMETER DiscoverSubnet
+        Controls if new hosts should be discovered for new host scans.
+
+        .PARAMETER IsFull
+        Marks subnet as used.
+
+        .PARAMETER TagId
+        Assignes state (tag) to subnet (default: 1 Used).
+
+        .PARAMETER Threshold
+        Subnet threshold.
+
+        .PARAMETER LocationId
+        Location index.
+    #>
+    [OutputType([PS.IPAM.Subnetwork])]
    [CmdletBinding()]
    param (
        [parameter(
            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="CIDR of subnet in dotted format (e.g 10.10.10.0/24)",
-            Position=0)]
+            Position=0
+        )]
        [ValidateScript({[ipaddress] $_.Split("/")[0] -and $_.Split("/")[1] -match "\d{1,2}"})]
        [ValidateNotNullOrEmpty()]
        [string]
@@ -15,147 +72,154 @@ function New-PSIPAMSubnet {
            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Section identifier",
-            Position=1)]
-        [ValidateScript({ $_ -match "^\d+$" })]
+            Position=1
+        )]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $SectionId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Subnet description",
-            Position=2)]
+            Position=2
+        )]
+        [ValidateNotNullOrEmpty()]
        [string]
        $Description,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Assigns subnet to VLAN",
-            Position=3)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=3
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $VlanId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Assigns subnet to VRF",
-            Position=4)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=4
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $VrfId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Master subnet id for nested subnet",
-            Position=5)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=5
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $MasterSubnetId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of nameserver to attach to subnet",
-            Position=6)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=6
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $NameserverId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls weather subnet is displayed as IP address or Name in subnets menu",
-            Position=7)]
+            Position=7
+        )]
        [switch]
        $ShowName,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls if PTR records should be created for subnet",
-            Position=8)]
+            Position=8
+        )]
        [switch]
        $DNSRecursive,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls weather hostname DNS records are displayed",
-            Position=9)]
+            Position=9
+        )]
        [switch]
        $DNSRecords,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls if IP requests are allowed for subnet",
-            Position=10)]
+            Position=10
+        )]
        [switch]
        $AllowRequests,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls which scanagent to use for subnet (default id 1)",
-            Position=11)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=11
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $ScanAgentId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Controls if new hosts should be discovered for new host scans",
-            Position=12)]
+            Position=12
+        )]
        [switch]
        $DiscoverSubnet,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Marks subnet as used",
-            Position=12)]
+            Position=12
+        )]
        [switch]
        $IsFull,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Assignes state (tag) to subnet (default: 1 Used)",
-            Position=12)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=12
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $TagId,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Subnet threshold",
-            Position=13)]
-        [ValidateScript({ $_ -match "^\d+$" -and $_ -le 100 -and $_ -ge 1 })]
+            Position=13
+        )]
+        [ValidateScript({ $_ -le 100 -and $_ -ge 1 })]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $Threshold,
        [parameter(
            Mandatory=$false,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Location index",
-            Position=14)]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [string]
+            Position=14
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
        $LocationId,
-
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true)]
+        [parameter(
+            Mandatory=$false,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=15
+        )]
        [ValidateScript({ $_ -is [Hashtable] -or $_ -is [PSCustomObject] })]
+        [ValidateNotNullOrEmpty()]
        $CustomFields
    )
    process {
        $_params = @{
-            Controller = "subnets"
+            Controller = [PS.IPAM.controllers]::subnets
            Method     = "POST"
        }

@@ -182,10 +246,7 @@ function New-PSIPAMSubnet {

        if ($CustomFields) {
            if ($CustomFields -is [PSCustomObject]) {
-                $_customFields = @{};
-                $CustomFields | Get-Member -MemberType *Property | Where-Object {
-                    $_customFields.($_.name) = $CustomFields.($_.name)
-                }
+                $_customFields = ConvertTo-Hashtable -InputObject $CustomFields
            } else { $_customFields = $CustomFields }
    
            $_body = $_body + $_customFields
@@ -193,10 +254,11 @@ function New-PSIPAMSubnet {

        $_params.Add("Params",$_body)

-        $_result = Invoke-PSIPAMRequest @_params
+        $_result = Invoke-Request @_params
+
        if ($_result) {
-            return Get-PSIPAMSubnet -CIDR $_result
+            return Get-Subnet -CIDR $_result
        }
    }
 }
-Export-ModuleMember -Function New-PSIPAMSubnet
+Export-ModuleMember -Function New-Subnet
--- a/functions/public/Remove-Address.ps1
+++ b/functions/public/Remove-Address.ps1
@@ -0,0 +1,39 @@
+function Remove-Address {
+    [CmdletBinding(DefaultParameterSetName="ByID")]
+    param (
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            Position=0,
+            ParameterSetName="ByID"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [int]
+        $Id,
+        [parameter(
+            Mandatory=$true,
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            Position=0,
+            ParameterSetName="ByAddressObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Address]
+        $AddressObject
+    )
+    process {
+        $_params = @{
+            Controller = [PS.IPAM.controllers]::addresses
+            Method     = "DELETE"
+        }
+
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"            { $_identifiers = @($Id); break }
+            "ByAddressObject" { $_identifiers = @($AddressObject.Id); break }
+        }
+        $_params.Add("Identifiers",$_identifiers)
+
+        Invoke-Request @_params
+    }
+}
+Export-ModuleMember Remove-Address
--- a/functions/public/Remove-PSIPAMAddress.ps1
+++ b/functions/public/Remove-PSIPAMAddress.ps1
@@ -1,35 +0,0 @@
-function Remove-PSIPAMAddress {
-    [CmdletBinding(DefaultParameterSetName="ByID")]
-    param (
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,Position=0,ParameterSetName="ByID")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $Id,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,Position=0,ParameterSetName="ByIP")]
-        [ValidateScript({[ipaddress] $_ })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $IP,
-        [parameter(Mandatory=$true,ValueFromPipeline=$true,Position=1,ParameterSetName="ByIP")]
-        [ValidateScript({ $_ -match "^\d+$" })]
-        [ValidateNotNullOrEmpty()]
-        [string]
-        $SubnetId
-    )
-    process {
-        $_params = @{
-            Controller = "addresses"
-            Method     = "DELETE"
-        }
-
-        switch ($PSCmdlet.ParameterSetName) {
-            "ByID"      { $_identifiers = @($Id) }
-            "ByIP"      { $_identifiers = @($IP,$SubnetId) }
-        }
-        $_params.Add("Identifiers",$_identifiers)
-
-        Invoke-PSIPAMRequest @_params
-    }
-}
-Export-ModuleMember Remove-PSIPAMAddress
--- a/functions/public/Set-PSIPAMAddress.ps1
+++ b/functions/public/Set-PSIPAMAddress.ps1
@@ -1,150 +1,171 @@
-function Set-PSIPAMAddress {
-    [CmdletBinding()]
+function Set-Address {
+    <#
+        .SYNOPSIS
+        Edit address object.
+
+        .PARAMETER Id
+        Id of subnet address belongs to.
+
+        .PARAMETER AddressObject
+        Address object to edit.
+
+        .PARAMETER Gateway
+        Defines if address is presented as gateway
+
+        .PARAMETER Description
+        Address description.
+    #>
+    [OutputType([PS.IPAM.address])]
+    [CmdletBinding(DefaultParameterSetName="ById")]
    param (
        [parameter(
            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Id of subnet address belongs to",
-            Position=0)]
-        [ValidateScript({ $_ -match "^\d+$" })]
+            Position=0,
+            ParameterSetName="ById"
+        )]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $Id,
        [parameter(
-            Mandatory=$false,
+            Mandatory=$true,
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Defines if address is presented as gateway",
-            Position=1)]
+            Position=0,
+            ParameterSetName="ByAddressObject"
+        )]
+        [ValidateNotNullOrEmpty()]
+        [PS.IPAM.Address]
+        $AddressObject,
+        [parameter(
+            Position=1
+        )]
+        [parameter(
+            ValueFromPipeline=$true,
+            ValueFromPipelineByPropertyName=$true,
+            ParameterSetName="ById"
+        )]
        [bool]
        $Gateway,
        [parameter(
-            Mandatory=$false,
+            Position=2
+        )]
+        [parameter(
            ValueFromPipeline=$true,
            ValueFromPipelineByPropertyName=$true,
-            HelpMessage="Address description",
-            Position=2)]
+            ParameterSetName="ById"
+        )]
        [ValidateNotNullOrEmpty()]
        [string]
        $Description,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Address hostname",
-            Position=3)]
+            Position=3
+        )]
        [ValidateNotNullOrEmpty()]
        [string]
        $Hostname,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Mac address",
-            Position=4)]
+            Position=4
+        )]
        [ValidateScript({ $_.Replace(":","") -match "^$('([A-F0-9]{2})' * 6)$" })]
        [ValidateNotNullOrEmpty()]
        [string]
        $MAC,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Address owner",
-            Position=5)]
+            Position=5
+        )]
        [ValidateNotNullOrEmpty()]
        [string]
        $Owner,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Id of subnet address belongs to",
-            Position=6)]
-        [ValidateScript({ $_ -match "^\d+$" })]
+            Position=6
+        )]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $TagId,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Controls if PTR should not be created",
-            Position=7)]
+            Position=7
+        )]
        [bool]
        $PTRIgnore,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Id of PowerDNS PTR record",
-            Position=8)]
-        [ValidateScript({ $_ -match "^\d+$" })]
+            Position=8
+        )]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $PTRId,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Note",
-            Position=9)]
+            Position=9
+        )]
        [ValidateNotNullOrEmpty()]
        [string]
        $Note,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Exclude this address from status update scans (ping)",
-            Position=10)]
+            Position=10
+        )]
        [bool]
        $ExcludePing,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Id of device address belongs to",
-            Position=11)]
-        [ValidateScript({ $_ -match "^\d+$" })]
+            Position=11
+        )]
        [ValidateNotNullOrEmpty()]
-        [string]
+        [int]
        $DeviceId,
        [parameter(
            Mandatory=$false,
-            ValueFromPipeline=$true,
-            ValueFromPipelineByPropertyName=$true,
            HelpMessage="Port",
-            Position=12)]
+            Position=12
+        )]
        [ValidateNotNullOrEmpty()]
        [string]
        $Port,
-
-        [parameter(Mandatory=$false,ValueFromPipeline=$true,ValueFromPipelineByPropertyName=$true)]
+        [parameter(Mandatory=$false)]
        [ValidateScript({ $_ -is [Hashtable] -or $_ -is [PSCustomObject] })]
        $CustomFields
    )
    process {
        $_params = @{
-            Controller = "addresses"
+            Controller = [PS.IPAM.controllers]::addresses
            Method     = "PATCH"
        }
-        $_identifiers = @($Id)
+        switch ($PSCmdlet.ParameterSetName) {
+            "ByID"            { $_id = $Id; break }
+            "ByAddressObject" { $_id = $AddressObject.id; break }
+        }
+        $_identifiers = @($_id)

        $_params.Add("Identifiers",$_identifiers)

        $_body = @{ }
-        if ($Gateway)        { $_body.Add("is_gateway", [int]$Gateway) }
+        if ($Gateway)        { $_body.Add("is_gateway", $Gateway) }
        if ($Description)    { $_body.Add("description", $Description) }
        if ($Hostname)       { $_body.Add("hostname", $Hostname) }
        if ($MAC)            { $_body.Add("mac", $MAC) }
        if ($Owner)          { $_body.Add("owner", $Owner) }
        if ($TagId)          { $_body.Add("tag", $TagId) }
-        if ($PTRIgnore)      { $_body.Add("PTRignore", [int]$PTRIgnore) }
+        if ($PTRIgnore)      { $_body.Add("PTRignore", $PTRIgnore) }
        if ($PTRId)          { $_body.add("PTR", $PTRId)}
        if ($Note)           { $_body.Add("note", $Note) }
-        if ($ExcludePing)    { $_body.Add("excludePing", [int]$ExcludePing) }
+        if ($ExcludePing)    { $_body.Add("excludePing", $ExcludePing) }
        if ($DeviceId)       { $_body.Add("deviceId", $DeviceId) }
        if ($Port)           { $_body.Add("port", $Port) }

@@ -162,11 +183,11 @@ function Set-PSIPAMAddress {
        $_params.Add("Params",$_body)

        try {
-            Invoke-PSIPAMRequest @_params
+            Invoke-Request @_params
        }
        finally {
-            Get-PSIPAMAddress -Id $Id
+            Get-Address -id $_id
        }
    }
 }
-Export-ModuleMember -Function Set-PSIPAMAddress
+Export-ModuleMember -Function Set-Address
--- a/functions/public/Set-PSIPAMSubnet.ps1
+++ b/functions/public/Set-PSIPAMSubnet.ps1
--- a/ps.ipam.psd1
+++ b/ps.ipam.psd1
--- a/types/types.ps1xml
+++ b/types/types.ps1xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Types>
+  <Type>
+    <Name>ps.ipam.address</Name>
+    <Members>
+      <MemberSet>
+        <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Ip</Name>
+              <Name>Hostname</Name>
+              <Name>Description</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.tag</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Type</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.domain</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Name</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.section</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Name</Name>
+              <Name>MasterSectionId</Name>
+              <Name>StrictMode</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.vlan</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Name</Name>
+              <Name>DomainId</Name>
+              <Name>Number</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.vrf</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Name</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.subnetwork</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Subnet</Name>
+              <Name>Mask</Name>
+              <Name>SectionId</Name>
+              <Name>Description</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+  <Type>
+    <Name>ps.ipam.nameserver</Name>
+    <Members>
+      <MemberSet>
+      <Name>PSStandardMembers</Name>
+        <Members>
+          <PropertySet>
+            <Name>DefaultDisplayPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+              <Name>Name</Name>
+              <Name>NameServers</Name>
+              <Name>Description</Name>
+            </ReferencedProperties>
+          </PropertySet>
+          <PropertySet>
+            <Name>DefaultKeyPropertySet</Name>
+            <ReferencedProperties>
+              <Name>Id</Name>
+            </ReferencedProperties>
+          </PropertySet>
+        </Members>
+      </MemberSet>
+    </Members>
+  </Type>
+</Types>
Author	SHA1	Message	Date
Arnike	fb39efd493	Set-Address documented	2022-12-17 23:58:22 +03:00
Arnike	e45d2665fa	Documentation & fixes	2022-12-17 22:51:26 +03:00
Arnike	2af591dbbf	New-Address documentation	2022-12-17 14:53:48 +03:00
Arnike	85e13dc150	Documented new-subnet	2022-12-17 14:36:41 +03:00
Arnike	d1128997cc	Added pscustomobject to hashtable converter	2022-12-17 02:11:13 +03:00
Arnike	bc645fc0d8	Added Close-Session cmdlet	2022-12-17 01:51:55 +03:00
Arnike	ced1dde708	Merge branch 'main' of https://git.arnike.ru/Arnike/ps.ipam	2022-12-17 01:37:51 +03:00
Arnike	bad183aff4	Get-Nameserver fix	2022-12-17 01:37:50 +03:00
Arnike	e456d7affe	Remove-Address fix	2022-12-17 01:35:33 +03:00
Arnike	4c128f5864	Get-Subnet fix	2022-12-17 01:20:34 +03:00
Arnike	0913fc2069	content-type fix	2022-12-17 01:11:05 +03:00
Arnike	ea9b760933	nameserver type fix.	2022-12-14 16:55:08 +03:00
Arnike	833bb183eb	Encoding fix	2022-12-14 16:00:00 +03:00
Arnike	ed9d648074	Merge pull request 'Types-implement' (#5 ) from Types-implement into main Reviewed-on: #5	2022-12-14 12:54:08 +00:00
Arnike	ad9744bf56	version fix	2022-12-14 15:53:43 +03:00
Arnike	1291bc0b69	CI\CD prep	2022-12-14 15:40:31 +03:00
Arnike	b1c5feb73b	Added nameserver type	2022-12-14 15:27:32 +03:00
Arnike	6fb2e81142	Fixed subcontrollers	2022-12-14 15:26:43 +03:00
Arnike	9912656752	Documentation	2022-12-14 13:22:13 +03:00
Arnike	538d84305f	subnetwork type fix	2022-12-14 11:23:27 +03:00
Arnike	078beb8d3c	Merge pull request 'Types-implement' (#4 ) from Types-implement into main Reviewed-on: #4	2022-12-13 20:55:44 +00:00
Arnike	9069989af3	Fixes	2022-12-12 18:58:13 +03:00
Arnike	0742737f0d	Added Assign-Tag cmdlet	2022-12-12 18:57:51 +03:00
Arnike	5a34f03779	Fixes, added session class	2022-12-12 13:08:04 +03:00
Arnike	7d0d1b53ae	first working types	2022-12-06 17:20:45 +03:00
Arnike	a1b03b81c0	replaced hardcoded text by enums in some functions	2022-12-05 17:48:20 +03:00
Arnike	4fc6bac4b5	subnet type	2022-12-05 16:51:33 +03:00
Arnike	c4b15d7387	enums	2022-12-05 15:29:03 +03:00
Arnike	affbd18de2	classlib all types implemented	2022-12-05 14:08:59 +03:00
Arnike	09cd00dc66	Base	2022-12-05 08:48:37 +03:00