From fafbf29413f4cc3002cbf1b88effcd832be5c602 Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 7 Sep 2018 14:05:32 +0200 Subject: [PATCH] bug 537 SDN-assist does not connect new instances over an existing vim network Change-Id: I47115d0957cd9c64606085132fd3f7e4003e7fc2 Signed-off-by: tierno --- openmanod | 2 +- osm_ro/vim_thread.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openmanod b/openmanod index 367b505f..3fd1ae0c 100755 --- a/openmanod +++ b/openmanod @@ -48,7 +48,7 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "0.5.77-r587" +__version__ = "0.5.78-r588" version_date = "Sep 2018" database_version = 32 # expected database schema version diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py index 089e7b96..c981e31f 100644 --- a/osm_ro/vim_thread.py +++ b/osm_ro/vim_thread.py @@ -941,8 +941,9 @@ class vim_thread(threading.Thread): sdn_net_id = None with self.db_lock: result = self.db.get_rows(SELECT=('sdn_net_id',), FROM='instance_nets', - WHERE={'vim_net_id': vim_net_id, 'instance_scenario_id': None, - 'datacenter_tenant_id': self.datacenter_tenant_id}) + WHERE={'vim_net_id': vim_net_id, + 'datacenter_tenant_id': self.datacenter_tenant_id}, + ORDER="instance_scenario_id") if result: sdn_net_id = result[0]['sdn_net_id'] -- 2.25.1