From b101872396a91b6cda600a4c8567c6a943209943 Mon Sep 17 00:00:00 2001 From: stevenvanrossem Date: Thu, 6 Apr 2017 02:21:20 +0200 Subject: [PATCH] fix issues with installing docker management networks --- misc/sonata-demo-service.son | Bin 3532 -> 3596 bytes src/emuvim/api/sonata/__init__.py | 3 +- src/emuvim/api/sonata/dummygatekeeper.py | 101 +++++++++++++++++------ 3 files changed, 77 insertions(+), 27 deletions(-) mode change 100644 => 100755 misc/sonata-demo-service.son diff --git a/misc/sonata-demo-service.son b/misc/sonata-demo-service.son old mode 100644 new mode 100755 index 248f88cf8246b1d89438dd6751cddc0f20da9b5d..bbe46c2e8beedf14cebcda2b30e193c7646f2b51 GIT binary patch delta 728 zcmX>j-6ON%0;ePc0|N(xFi)G8L8;elLna1>R1O9PX$BdFi3_CbLqj+jn5We}jR4`& z3T_5QmKV$n3}9kysBiIX1A)E2!{7XPd<)im@YG8ultOH)kEPelL zRV6=9>=H{m#kuy|+vv4r^CK2>FHHJzaK%BPxD6{!S6NpiO0EiD$WbShA9yt;{@sG2 zxa!KUzpe@JKRH`iKmVbcsLPBjJ&lP?lh-}=Ww7aPe6_vewz!U$qTcapdX=w;QtG+wZE0zd93g?B$d>B9mKJw`lsW-I-TEq2yB0Qt2=? z)#c`!IRzZT7c#8T-66X-TJG>e`<}M{|JF=?Fs0luc2imH9KFLYFR`8R_YB|vr)0ys zmR~woqK&M&Q+B;js(vSRVEaUkGwRbb?KOSecUH;%=aT+3zp>r>VeP_YKQbik<}BPF z&ozJH|1CW7XD`&pfta7xThBgNUt2mYrq5dK+|!3uGlQns?47~unDKkX%D6yPCI1PV z)`j2M%PW03(;!qeY^LT~R>QMQ<$VjJPx{`U#=EoUZpKXKT`_8Z^Lnp4T<1_O&JNnR ztNrXg<%N6Re$QK6b3?v---Ctr6+hye-2Xke`0GL4^?tu##ZNrja@j&W+}!LlyzT^g zUt4kc{}$Kg+zO67leLwRlU8fkv)z}Uw>D>Xk;Qt}lRYJ>A6B-`Z`*xri;eQy*zzxR zMoja)bQYP;+Sg|MrO55I#o5~%+l-}(`@SX!Mn3;5y;+mTgHcP4Sp-M2lK_e{Ffan~ kmd4YZ44_1)7aGC}NrY$#FuPx# delta 654 zcmV;90&)F}9LyWA&S*}vSfnUehjDfusyXqdugwX7ew$Z$R1;p&A%^pXn+i~Fw>l{toNQIOA5E9lsbVQ zoGe!Gg0?ZJAK-=Os9&Wf_(`Hg-3W7efZBT<)Ya>YB@wDWj)xqBOcG&cgrrnSL8eK9 z5Ja8;HA#J{O#mRMLl%EL!vuChwU4{bW-iJd@x8kuUhM{uAZ53sq%|90IX0OV%0->P z(>t$Kh0vgGMTT$|rUX-JM94}m2y?(%nG5`S{?^=}Qm3v)o?#yyj{BgH`pk7M=#-u` zSEa8+CaE#PSR|9SLL1Agv=a2zT>^yAS11H$3w`RtF=E3vi-&*jTdoswDtb;ItUE{3 zBby!_VR1_P`W2_6b0;)sso&C3E{dD7XP$X$fVqoQV=;bA|5LIN*NR7fg$?m9z}Z^3 zv}O(;ufwwi`Nx&;CHW8Q@bQBD$CdCU`A`3NvnAYTZzsQpNEK;Pr?-hSwMV^*I2)#+}!SV8(kTyx%Dn%QAwn*BN&0#?<{}+$X %s" % ( + "Setting up E-LAN interface. %s(%s:%s) -> %s" % ( vnf_name, vnf_id, intf_name, ip_address)) if vnf_name in self.vnfds: @@ -740,6 +783,12 @@ class Service(object): if vnf_sap_docker_name in saps_ext: return vnf_sap_docker_name + def check_mgmt_interface(self, intf_list): + SAPs_mgmt = [p.get('id') for p in self.nsd["connection_points"] if 'management' in p.get('type')] + for intf_name in intf_list: + if intf_name in SAPs_mgmt: + return True + """ Some (simple) placement algorithms """ @@ -816,7 +865,7 @@ class RoundRobinDcPlacementWithSAPs(object): intf_id, intf_name, intf_sap_id = parse_interface(intf) if intf_sap_id in saps: dc = dcs_list[randint(0, dc_len-1)] - saps[intf_id]['dc'] = dc + saps[intf_sap_id]['dc'] = dc -- 2.25.1