From d0a03972a6b835bd19f3a13cc87c9e84fbb9d16d Mon Sep 17 00:00:00 2001
From: Harald Jensas <hjensas@redhat.com>
Date: Mon, 26 Feb 2018 23:19:30 +0100
Subject: [PATCH] Use ipaddress module

This patch replaces use of ipaddr python module with
ipaddress module. The ipaddr has been superseded by the
ipaddress module.

Also install python-ipaddress instead of python-ipaddr in
deployed-server bootstrap scripts.

Closes-Bug: #1751934
Change-Id: I63ae89869c8994e17b3460f9ae94e5fa922f6237
---
 deployed-server/deployed-server-bootstrap-centos.sh | 2 +-
 deployed-server/deployed-server-bootstrap-rhel.sh   | 2 +-
 validation-scripts/all-nodes.sh                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployed-server/deployed-server-bootstrap-centos.sh b/deployed-server/deployed-server-bootstrap-centos.sh
index 90cdf6d6fe..33bd30fcd2 100644
--- a/deployed-server/deployed-server-bootstrap-centos.sh
+++ b/deployed-server/deployed-server-bootstrap-centos.sh
@@ -4,7 +4,7 @@ set -eux
 
 yum install -y \
     jq \
-    python-ipaddr \
+    python-ipaddress \
     puppet-tripleo \
     os-net-config \
     openvswitch \
diff --git a/deployed-server/deployed-server-bootstrap-rhel.sh b/deployed-server/deployed-server-bootstrap-rhel.sh
index de6f2d862f..2d04a031a0 100644
--- a/deployed-server/deployed-server-bootstrap-rhel.sh
+++ b/deployed-server/deployed-server-bootstrap-rhel.sh
@@ -4,7 +4,7 @@ set -eux
 
 yum install -y \
     jq \
-    python-ipaddr \
+    python-ipaddress \
     puppet-tripleo\
     os-net-config \
     openvswitch \
diff --git a/validation-scripts/all-nodes.sh b/validation-scripts/all-nodes.sh
index 296dcd365f..624559b22f 100644
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -33,7 +33,7 @@ function ping_controller_ips() {
       networks=$(ip r | grep -v default | cut -d " " -f 1)
     fi
     for LOCAL_NETWORK in $networks; do
-      in_network=$(python -c "import ipaddr; net=ipaddr.IPNetwork('$LOCAL_NETWORK'); addr=ipaddr.IPAddress('$REMOTE_IP'); print(addr in net)")
+      in_network=$(python -c "import ipaddress; net=ipaddress.ip_network(unicode('$LOCAL_NETWORK')); addr=ipaddress.ip_address(unicode('$REMOTE_IP')); print(addr in net)")
       if [[ $in_network == "True" ]]; then
         echo "Trying to ping $REMOTE_IP for local network ${LOCAL_NETWORK}."
         set +e