Fix VCD VIMconn when model_type is not present for SR-IOV, use net['type']

[osm/RO.git] / Makefile

diff --git a/Makefile b/Makefile
index 8330b74..7548100 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,12 +37,13 @@ prepare:
        cp -r instance-scenarios build/osm_ro
        cp -r scripts build/osm_ro
        cp -r database_utils build/osm_ro
+       cp LICENSE build/osm_ro
 
 connectors: prepare
        # python-novaclient is required for that
        rm -f build/osm_ro/openmanolinkervimconn.py
        cd build/osm_ro; for i in `ls vimconn_*.py |sed "s/\.py//"` ; do echo "import $$i" >> openmanolinkervimconn.py; done
-       python build/osm_ro/openmanolinkervimconn.py
+       python build/osm_ro/openmanolinkervimconn.py 2>&1
        rm -f build/osm_ro/openmanolinkervimconn.py
 
 build: connectors prepare
@@ -60,6 +61,7 @@ lib-openvim:
 
 osm-im:
        $(shell git clone https://osm.etsi.org/gerrit/osm/IM)
+       git -C IM checkout $(BRANCH)
        make -C IM clean all
 
 package: prepare