Skip to content

Commit

Permalink
Renamed install_agent_remote to install_agent_local
Browse files Browse the repository at this point in the history
Updated decodestring to decodebytes in VCP _install_agent method
  • Loading branch information
sgilbride committed Jan 12, 2022
1 parent c5c0ccb commit 55b2b75
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def __getattr__(cls, name):
author = 'The VOLTTRON Community'

# The short X.Y version
version = '8.1.2'
version = '8.1.3'
# The full version, including alpha/beta/rc tags
release = '8.1.2'
release = '8.1.3'


# -- General configuration ---------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions services/core/VolttronCentralPlatform/vcplatform/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
from enum import Enum

from volttron.platform.agent import utils
from volttron.platform.install_agents import install_agent_remote
from volttron.platform.install_agents import install_agent_local

utils.setup_logging()
_log = logging.getLogger(__name__)
Expand Down Expand Up @@ -1170,7 +1170,7 @@ def _install_agent(self, fileargs):
# after base64,
with open(path, 'wb') as fout:
fout.write(
base64.decodestring(
base64.decodebytes(
fileargs['file'].split(base64_sep)[1].encode('utf-8')
)
)
Expand All @@ -1186,7 +1186,7 @@ def _install_agent(self, fileargs):
json=agent_json,
st=agent_st
)
uuid = install_agent_remote(opts)
uuid = install_agent_local(opts)
result = dict(uuid=uuid)
except Exception as e:
err_str = "EXCEPTION: " + str(e)
Expand Down
2 changes: 1 addition & 1 deletion volttron/platform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
from urllib.parse import urlparse

from ..utils.frozendict import FrozenDict
__version__ = '8.1.2'
__version__ = '8.1.3'

_log = logging.getLogger(__name__)

Expand Down
7 changes: 4 additions & 3 deletions volttron/platform/install_agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,18 @@ def install_agent_vctl(opts, publickey=None, secretkey=None, callback=None):
vctl install sub-parser.
"""

agent_uuid = install_agent_remote(opts, publickey=publickey,
agent_uuid = install_agent_local(opts, publickey=publickey,
secretkey=secretkey, callback=callback)
if agent_uuid:
return 0
else:
return 1


def install_agent_remote(opts, publickey=None, secretkey=None, callback=None):
def install_agent_local(opts, publickey=None, secretkey=None, callback=None):
"""
Used by install_agent_vctl and vc for installing agents.
Install agents via either directory or wheel
Used by VC and VCTL
"""
try:
install_path = opts.install_path
Expand Down

0 comments on commit 55b2b75

Please sign in to comment.