From 40e895657b677836441040e4cc8d8ccfd4a78c2a Mon Sep 17 00:00:00 2001
From: Yi Feng <fengyi@fujitsu.com>
Date: Fri, 29 Jul 2022 11:02:59 +0900
Subject: [PATCH] Fix IPv4 check failure in UT

Since the version of jsonschema has been updated from 3.2.0 to 4.7.2,
when tox executes UT, it reports an error when checking IPv4, and now
the invalid IP address is fixed.

Due to FT failure caused by ceilometer, the installation of Ceilometer
was commented out in `.zuul.yaml`.
Note that this is only a temporary change and will need to be changed
back when the ceilometer issue is resolved.

Closes-Bug: #1983067
Change-Id: Ice9be4d71ee1689b57add263be5fadd77a7f5ccd
---
 .zuul.yaml                        | 20 ++++++++++----------
 tacker/tests/unit/vnflcm/fakes.py |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 7afd76eae..e0d0bc351 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -86,7 +86,7 @@
       - openstack/blazar-nova
       - openstack/horizon
       - openstack/barbican
-      - openstack/ceilometer
+      #- openstack/ceilometer
       - openstack/heat
       - openstack/mistral
       - openstack/mistral-dashboard
@@ -187,7 +187,7 @@
         tox_install_siblings: false
       controller-tacker:
         devstack_plugins:
-          ceilometer: https://opendev.org/openstack/ceilometer
+          #ceilometer: https://opendev.org/openstack/ceilometer
           tacker: https://opendev.org/openstack/tacker
         devstack_services:
           # OVN services
@@ -197,10 +197,10 @@
           # Neutron services
           q-ovn-metadata-agent: true
           # Ceilometer services
-          ceilometer-acompute: false
-          ceilometer-acentral: true
-          ceilometer-aipmi: false
-          ceilometer-anotification: true
+          #ceilometer-acompute: false
+          #ceilometer-acentral: true
+          #ceilometer-aipmi: false
+          #ceilometer-anotification: true
           # Tacker services
           tacker: true
           tacker-conductor: true
@@ -236,7 +236,7 @@
           #   gnocchi setup would run on every compute nodes (esp. multiple asynchronous calls
           #   of recreate_database() would be disastrous). Unused api servers would also be
           #   deployed on each compute node.
-          CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
+          #CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
           Q_SERVICE_PLUGIN_CLASSES: "qos,\
             networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,\
             neutron.services.qos.qos_plugin.QoSPlugin,\
@@ -244,10 +244,10 @@
           L2_AGENT_EXTENSIONS: qos
           ENABLE_CHASSIS_AS_GW: false
           Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
-        devstack_plugins:
-          ceilometer: https://opendev.org/openstack/ceilometer
+        #devstack_plugins:
+          #ceilometer: https://opendev.org/openstack/ceilometer
         devstack_services:
-          ceilometer-acompute: true
+          #ceilometer-acompute: true
           # To override the parent job's definitions.
           tls-proxy: false
           # OVN services
diff --git a/tacker/tests/unit/vnflcm/fakes.py b/tacker/tests/unit/vnflcm/fakes.py
index e8f612600..65cb70a3f 100644
--- a/tacker/tests/unit/vnflcm/fakes.py
+++ b/tacker/tests/unit/vnflcm/fakes.py
@@ -458,7 +458,7 @@ def get_vnf_instantiation_request_body():
                                     {
                                         "type": "IPV4",
                                         "fixedAddresses": [
-                                            '192.168.11.01',
+                                            '192.168.11.1',
                                             '192.168.21.202'
                                         ],
                                         "subnetId":