From 12c20c80b83f51efa204b0411e00e70e835fa1a4 Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Wed, 14 Feb 2018 08:49:50 -0500
Subject: [PATCH] Fix functional test about port

Also, update .zuul.yaml for queens
Fetch tox dir and html reports

Change-Id: I285370b020bce4def511da9a24aeacc1fc833f69
---
 .zuul.yaml                          | 33 +++++++----------------------
 playbooks/devstack/post.yaml        |  2 +-
 shade/tests/functional/test_port.py |  9 ++++++++
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 81bef7588..d59935c14 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     name: shade-tox-py27-tips
     parent: openstack-tox-py27
     description: |
-      Run tox python 27 unittests against master of important libs
+      Run tox python 27 unittests against stable/queens of important libs
     vars:
       tox_install_siblings: true
     # shade in required-projects so that os-client-config and keystoneauth
@@ -16,7 +16,7 @@
     name: shade-tox-py35-tips
     parent: openstack-tox-py35
     description: |
-      Run tox python 35 unittests against master of important libs
+      Run tox python 35 unittests against stable/queens of important libs
     vars:
       tox_install_siblings: true
     # shade in required-projects so that os-client-config and keystoneauth
@@ -46,11 +46,7 @@
     run: playbooks/devstack/run.yaml
     post-run: playbooks/devstack/post.yaml
     required-projects:
-      # These jobs will DTRT when shade triggers them, but we want to make
-      # sure stable branches of shade never get cloned by other people,
-      # since stable branches of shade are, well, not actually things.
       - name: openstack-infra/shade
-        override-branch: master
       - name: openstack/heat
       - name: openstack/swift
     timeout: 9000
@@ -112,7 +108,7 @@
     name: shade-functional-devstack
     parent: shade-functional-devstack-base
     description: |
-      Run shade functional tests against a master devstack
+      Run shade functional tests against a stable/queens devstack
     vars:
       devstack_localrc:
         Q_SERVICE_PLUGIN_CLASSES: qos
@@ -122,7 +118,7 @@
     name: shade-functional-devstack-python3
     parent: shade-functional-devstack
     description: |
-      Run shade functional tests using python3 against a master devstack
+      Run shade functional tests using python3 against a stable/queens devstack
     vars:
       shade_environment:
         SHADE_TOX_PYTHON: python3
@@ -132,7 +128,7 @@
     parent: shade-functional-devstack
     description: |
       Run shade functional tests with tips of library dependencies against a
-      master devstack.
+      stable/queens devstack.
     required-projects:
       - name: openstack/keystoneauth
       - name: openstack/os-client-config
@@ -144,7 +140,7 @@
     parent: shade-functional-devstack-tips
     description: |
       Run shade functional tests with tips of library dependencies using
-      python3 against a master devstack.
+      python3 against a stable/queens devstack.
     vars:
       tox_environment:
         SHADE_TOX_PYTHON: python3
@@ -153,7 +149,7 @@
     name: shade-functional-devstack-magnum
     parent: shade-functional-devstack
     description: |
-      Run shade functional tests against a master devstack with magnum
+      Run shade functional tests against a stable/queens devstack with magnum
     required-projects:
       - openstack/magnum
       - openstack/python-magnumclient
@@ -177,23 +173,11 @@
     name: shade-ansible-functional-devstack
     parent: shade-functional-devstack
     description: |
-      Run shade ansible functional tests against a master devstack
+      Run shade ansible functional tests against a stable/queens devstack
       using released version of ansible.
     vars:
       tox_envlist: ansible
 
-- job:
-    name: shade-ansible-devel-functional-devstack
-    parent: shade-ansible-functional-devstack
-    description: |
-      Run shade ansible functional tests against a master devstack
-      using git devel branch version of ansible.
-    # required-projects:
-    #   - github.com/ansible/ansible
-    voting: false
-    vars:
-      tox_install_siblings: true
-
 - project-template:
     name: shade-functional-tips
     check:
@@ -216,7 +200,6 @@
       jobs:
         - bifrost-integration-tinyipa
         - bifrost-integration-tinyipa-opensuse-423
-        - shade-ansible-devel-functional-devstack
         - shade-ansible-functional-devstack
         - shade-functional-devstack
         - shade-functional-devstack-magnum
diff --git a/playbooks/devstack/post.yaml b/playbooks/devstack/post.yaml
index db7ca7d67..7f0cb1982 100644
--- a/playbooks/devstack/post.yaml
+++ b/playbooks/devstack/post.yaml
@@ -1,4 +1,4 @@
 - hosts: all
   roles:
     - fetch-tox-output
-    - fetch-stestr-output
+    - fetch-subunit-output
diff --git a/shade/tests/functional/test_port.py b/shade/tests/functional/test_port.py
index a824a2fe3..731f57c18 100644
--- a/shade/tests/functional/test_port.py
+++ b/shade/tests/functional/test_port.py
@@ -128,6 +128,15 @@ class TestPort(base.BaseFunctionalTestCase):
 
         updated_port = self.operator_cloud.get_port(name_or_id=port['id'])
         self.assertEqual(port.get('name'), new_port_name)
+        port.pop('revision_number', None)
+        port.pop(u'revision_number', None)
+        port.pop('updated_at', None)
+        port.pop(u'updated_at', None)
+        updated_port.pop('revision_number', None)
+        updated_port.pop(u'revision_number', None)
+        updated_port.pop('updated_at', None)
+        updated_port.pop(u'updated_at', None)
+
         self.assertEqual(port, updated_port)
 
     def test_delete_port(self):