Merge pull request #25 from rundeck-plugins/enh/RUN-734_incl-private-…

…ips_220316 RUN-734: Add private IP info to Azure Node
rundeck-plugins · Mar 31, 2022 · bc5d9eb · bc5d9eb
2 parents e5c47a2 + 56a08e8
commit bc5d9eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -60,6 +60,8 @@ osDisk:name.selector                =    azure_osDisk_name
 osDisk:createOption.selector        =    azure_osDisk_createOption
 osDisk:diskSizeGB.selector          =    azure_osDisk_diskSizeGB
 
+netInterface:privateIp.selector     =    azure_netInterface_privateIp
+
 plan:name.selector                  =    azure_plan_name
 plan:product.selector               =    azure_plan_product
 plan:publisher.selector             =    azure_plan_publisher

diff --git a/src/main/groovy/com/rundeck/plugins/azure/azure/AzureNode.groovy b/src/main/groovy/com/rundeck/plugins/azure/azure/AzureNode.groovy
@@ -111,6 +111,8 @@ class AzureNode {
         azureAttributes."osDisk:createOption" = vm.storageProfile()?.osDisk()?.createOption()?.toString()
         azureAttributes."osDisk:diskSizeGB" = vm.storageProfile()?.osDisk()?.diskSizeGB()?.toString()
 
+        azureAttributes."netInterface:privateIp" = vm.getPrimaryNetworkInterface()?.primaryPrivateIP()
+
         if(vm.instanceView().vmAgent()!=null) {
             vm.instanceView().vmAgent().statuses()?.each { status->
                 azureAttributes."provisioningState:code" = status.code()
@@ -157,6 +159,8 @@ class AzureNode {
             case "azure_osDisk_createOption": return getAzureAttributes()!=null ? getAzureAttributes().get("osDisk:createOption"):null
             case "azure_osDisk_diskSizeGB": return getAzureAttributes()!=null ? getAzureAttributes().get("osDisk:diskSizeGB"):null
 
+            case "azure_netInterface_privateIp": return getAzureAttributes()!=null ? getAzureAttributes().get("netInterface:privateIp"):null
+
             case "azure_provisioningState_code": return getAzureAttributes()!=null ? getAzureAttributes().get("provisioningState:code"):null
             case "azure_provisioningState_displayStatus": return getAzureAttributes()!=null ? getAzureAttributes().get("provisioningState:displayStatus"):null
             case "azure_provisioningState_message": return getAzureAttributes()!=null ? getAzureAttributes().get("provisioningState:message"):null

diff --git a/src/main/groovy/com/rundeck/plugins/azure/azure/AzureNodeMapper.groovy b/src/main/groovy/com/rundeck/plugins/azure/azure/AzureNodeMapper.groovy
@@ -39,6 +39,7 @@ class AzureNodeMapper {
                                     "osDisk\\:name.selector=azure_osDisk_name\n" +
                                     "osDisk\\:createOption.selector=azure_osDisk_createOption\n" +
                                     "osDisk\\:diskSizeGB.selector=azure_osDisk_diskSizeGB\n" +
+                                    "netInterface\\:privateIp.selector=azure_netInterface_privateIp\n" +
                                     "provisioningState\\:code.selector=azure_provisioningState_code\n" +
                                     "provisioningState\\:displayStatus.selector=azure_provisioningState_displayStatus\n" +
                                     "provisioningState\\:message.selector=azure_provisioningState_message\n" +