From: tierno Date: Thu, 26 Nov 2020 15:55:20 +0000 (+0000) Subject: Remove IM dependency at Dockerfile-local X-Git-Tag: release-v9.0-start~3 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=fb13d2ea0b862011b80f2c64c95bdada2c893ff7 Remove IM dependency at Dockerfile-local minor fix at flavor data parse for cpus Change-Id: Idd706d75303e9b9b8c1c36e52c9a183e226e0c44 Signed-off-by: tierno --- diff --git a/Dockerfile-local b/Dockerfile-local index b99a0909..6105d117 100644 --- a/Dockerfile-local +++ b/Dockerfile-local @@ -30,8 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python3-neutronclient pyt python3-requests python3-netaddr python3-argcomplete curl \ && DEBIAN_FRONTEND=noninteractive curl -Lo /tmp/libzenohc.so https://github.com/eclipse-fog05/fog05/releases/download/v0.1.0/libzenohc.so \ && mv /tmp/libzenohc.so /usr/local/lib/libzenohc.so \ - && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U jsonrpclib-pelix cvprac \ - "osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im" "azure==4.0.0" boto \ + && DEBIAN_FRONTEND=noninteractive python3 -m pip install -U jsonrpclib-pelix cvprac "azure==4.0.0" boto \ pyone "oca @ git+https://github.com/python-oca/python-oca#egg=oca" \ pyangbind sphinx zenoh==0.3.0 yaks==0.3.0.post1 fog05-sdk==0.2.0 fog05==0.2.0 @@ -48,8 +47,6 @@ COPY . /root/RO RUN /root/RO/RO/osm_ro/scripts/install-osm-im.sh --develop && \ mkdir -p /var/log/osm && \ python3 -m pip install -e /root/RO/RO-plugin && \ - python3 -m pip install -e /root/RO/RO && \ - python3 -m pip install -e /root/RO/RO-client && \ python3 -m pip install -e /root/RO/NG-RO && \ python3 -m pip install -e /root/RO/RO-VIM-vmware && \ python3 -m pip install -e /root/RO/RO-VIM-openstack && \ diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index a9c5ec0a..1b4e9ebc 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -413,10 +413,8 @@ class Ns(object): flavor_data = { "disk": int(target_flavor["storage-gb"]), - # "ram": max(int(target_flavor["memory-mb"]) // 1024, 1), - # ^ TODO manage at vim_connectors MB instead of GB "ram": int(target_flavor["memory-mb"]), - "vcpus": target_flavor["vcpu-count"], + "vcpus": int(target_flavor["vcpu-count"]), } numa = {} extended = {}