.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = dcf4afcc6936929c71051f9d0142f769
+md5sum = 149ae45a3c6b99c7341551b8b63402f4
 
 [amari_lte.jinja2]
 _update_hash_filename_ = amari/lte.jinja2
@@ -80,7 +80,7 @@ md5sum = e5ca405581632c9ff9b435ff4a45d408
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 9d9b7aeef0e27821d216b5f53516d8ce
+md5sum = 6d14a7924981eed3fcf8f9fc97864066
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg

software/ors-amarisoft/instance.cfg

@@ -24,8 +24,11 @@ cert = $${slap-connection:cert-file}
 recipe = slapos.recipe.template:jinja2
 output = $${buildout:directory}/$${:filename}
 extra-context =
+depends = $${activate-eggs:recipe}
 context =
     import json_module json
+    import earfcn_module xlte.earfcn
+    import nrarfcn_module nrarfcn
     key eggs_directory buildout:eggs-directory
     key develop_eggs_directory buildout:develop-eggs-directory
     raw buildout_directory ${buildout:directory}
@@ -40,6 +43,24 @@ import-list =
     rawfile ru_lopcomm_libinstance.jinja2.cfg ${ru_lopcomm_libinstance.jinja2.cfg:target}
     rawfile ru_sunwave_libinstance.jinja2.cfg ${ru_sunwave_libinstance.jinja2.cfg:target}
 
+# activate eggs used in jinja2 templates
+[activate-eggs]
+recipe = slapos.recipe.build
+init =
+  import pkg_resources as rpkg
+  buildout = self.buildout['buildout']
+  env = rpkg.Environment([buildout['develop-eggs-directory'],
+                          buildout['eggs-directory']])
+  env.scan()
+  def activate(pkgspec):
+    req = rpkg.Requirement.parse(pkgspec)
+    for dist in rpkg.working_set.resolve([req], env):
+      rpkg.working_set.add(dist)
+
+  activate('xlte')
+  activate('nrarfcn')
+
+
 [amarisoft]
 recipe = slapos.recipe.build
 init =

software/ors-amarisoft/software-base.cfg

@@ -168,12 +168,13 @@ eggs =
   ${bcrypt:egg}
   xmltodict
   ncclient
+  nrarfcn
 interpreter = pythonwitheggs
 
 [xlte-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/kirr/xlte.git
-revision = e716ab51
+revision = 7c627ad
 git-executable = ${git:location}/bin/git
 # XXX temp (speedup build)
 develop = true
@@ -200,3 +201,4 @@ update-command = ${:command}
 websocket-client = 1.4.2
 ncclient = 0.6.13
 xmltodict = 0.13.0
+nrarfcn = 2.4.0:whl