From owner-svn-ports-head@freebsd.org Thu Jan 26 14:27:20 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADA3ECC2592; Thu, 26 Jan 2017 14:27:20 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 631D01A8F; Thu, 26 Jan 2017 14:27:20 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0QERJq3036266; Thu, 26 Jan 2017 14:27:19 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0QERJrs036264; Thu, 26 Jan 2017 14:27:19 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201701261427.v0QERJrs036264@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Thu, 26 Jan 2017 14:27:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432494 - in head/www/py-horizon: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jan 2017 14:27:20 -0000 Author: novel Date: Thu Jan 26 14:27:19 2017 New Revision: 432494 URL: https://svnweb.freebsd.org/changeset/ports/432494 Log: www/py-horizon: fix floating ips Fix an issue with listing and disassociating floating IP addresses from the Horizon dashboard. PR: 216375 Submitted by: maintainer Added: head/www/py-horizon/files/02-fix-floating-ips.patch (contents, props changed) Modified: head/www/py-horizon/Makefile Modified: head/www/py-horizon/Makefile ============================================================================== --- head/www/py-horizon/Makefile Thu Jan 26 14:26:46 2017 (r432493) +++ head/www/py-horizon/Makefile Thu Jan 26 14:27:19 2017 (r432494) @@ -3,6 +3,7 @@ PORTNAME= horizon PORTVERSION= 10.0.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= https://fossies.org/linux/misc/openstack/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -70,7 +71,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Bab ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js \ ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4 -EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 +EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 \ + ${FILESDIR}/02-fix-floating-ips.patch:-p1 NO_ARCH= yes Added: head/www/py-horizon/files/02-fix-floating-ips.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-horizon/files/02-fix-floating-ips.patch Thu Jan 26 14:27:19 2017 (r432494) @@ -0,0 +1,26 @@ +From 194ebeb4eb2efff32864452a52c2edfb4915b89a Mon Sep 17 00:00:00 2001 +From: Alexander Nusov +Date: Sun, 22 Jan 2017 13:31:51 +0300 +Subject: [PATCH] fixed floating IP list retrieving + +--- + openstack_dashboard/api/nova.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/openstack_dashboard/api/nova.py b/openstack_dashboard/api/nova.py +index 4a82cbc11..8a3936bad 100644 +--- a/openstack_dashboard/api/nova.py ++++ b/openstack_dashboard/api/nova.py +@@ -415,8 +415,7 @@ class FloatingIpManager(network_base.FloatingIpManager): + + def list(self, all_tenants=False): + return [FloatingIp(fip) for fip in +- self.client.floating_ips.list( +- all_tenants=all_tenants)] ++ self.client.floating_ips.list()] + + def get(self, floating_ip_id): + return FloatingIp(self.client.floating_ips.get(floating_ip_id)) +-- +2.11.0 +