Merge branch 'integration-power' into 'master'

Integration power

See merge request !45

.gitlab-ci.yml

+include: 'https://xgitlab.cels.anl.gov/argo/argotest/raw/master/gitlab/basic.yml'
+
 stages:
   - build
   - test
@@ -22,67 +24,3 @@ flake8:
   except:
     - /^wip\/.*/
     - /^WIP\/.*/
-
-.nix-build:
-  stage: build
-  tags:
-    - integration
-
-.nix-integration:
-  stage: test
-  artifacts:
-    paths:
-      - _output/cmd_err.log
-      - _output/cmd_out.log
-      - _output/daemon_out.log
-      - _output/daemon_out.log
-      - _output/nrm.log
-      - _output/.argo_nodeos_config_exit_message
-    expire_in: 1 week
-  except:
-    - /^wip\/.*/
-    - /^WIP\/.*/
-  tags:
-    - integration
-
-containers.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A containers
-    - rm -rf $CACHE
-
-libnrm.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A libnrm
-    - rm -rf $CACHE
-
-nrm.build:
-  extends: .nix-build
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-build .nix -A nrm
-    - rm -rf $CACHE
-
-TestHello.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestHello"
-    - rm -rf $CACHE
-
-TestListen.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestListen"
-    - rm -rf $CACHE
-
-TestPerfwrapper.test:
-  extends: .nix-integration
-  script:
-    - CACHE=$(mktemp -d --suffix=nixcache /tmp/deletable-nix-cache-XXXX)
-    - XDG_CACHE_HOME=$CACHE nix-shell .nix -A test --run "argotk.hs TestPerfwrapper"
-    - rm -rf $CACHE

.integration.nix

-{ argotest ? (builtins.fetchGit {
-    url = https://xgitlab.cels.anl.gov/argo/argotest.git;
-    ref="master";
-    rev="646d42f7b64f56cdb3ff54a7b4a59e0dfad3209c";
-})
-}:
-(import argotest {
-  nrm-src = ./.;
-  libnrm-src = builtins.fetchGit {
-      url = https://xgitlab.cels.anl.gov/argo/libnrm.git;
-      ref="downstream-refactor"; };
-}).test

.nix/default.nix

@@ -3,5 +3,5 @@ let argotest =
   "https://xgitlab.cels.anl.gov/argo/argotest/-/archive/master/argotest-master.tar.gz";
 in import "${argotest}/test.nix" {
   nrm-override = ./..;
-  testName = "base";
+  testName = "refactored";
 }

nrm/messaging.py

@@ -40,7 +40,7 @@ MSGFORMATS['up_rpc_rep'] = {'list': {'payload': list},
                                              'status': basestring},
                             'getpower': {'limit': basestring},
                             }
-MSGFORMATS['up_pub'] = {'power': {'total': int, 'limit': float},
+MSGFORMATS['up_pub'] = {'power': {'total': float, 'limit': float},
                         'container_start': {'container_uuid': basestring,
                                             'errno': int,
                                             'power': dict},