Merge pull request #86 from maxkuzkin/master

Product name fixes

Author: maxkuzkin

README.md

@@ -42,12 +42,12 @@ apsconnect install-frontend --source SOURCE --oauth-key OAUTH_KEY --oauth-secret
 				            [--network = proxy] [--hub-id HUB_ID] [--instance-only = false]
 ```
 ```
-⇒  apsconnect install-frontend package.aps.zip application-3-v1-687fd3e99eb 639a0c2bf3ab461aaf74a5c622d1fa34 --backend-url http://127.197.49.26/
-APSConnect-cli v.1.7.11
-Importing connector http://aps.odin.com/app/connector
-Connector http://aps.odin.com/app/connector imported with id=206 [ok]
+⇒  apsconnect install-frontend package.aps.zip 687fd3e99eb 61aaf74a5c622d1fa34 --backend-url http://127.0.0.1/
+APSConnect-cli v19
+Importing connector http://connect.cloudblue.com/product/example
+Connector http://connect.cloudblue.com/product/example imported with id=206 [ok]
 Resource types creation [ok]
-Service template "connector" created with id=16 [ok]
+Service template "Product A" created with id=16 [ok]
 Limits for Service template "16" are applied [ok]
 ```
 

VERSION

@@ -1 +1 @@
-19.4
+19.5

apsconnectcli/apsconnect.py

@@ -37,11 +37,12 @@
 
 
 class APSConnectUtil:
-    """ A command line tool for APS connector installation on Odin Automation in the relaxed way"""
+    """A command line tool for installation of APS packages from
+the CloudBlue Connect into the CloudBlue Commerce"""
 
     def init_hub(self, hub_host, user='admin', pwd='1q2w3e', use_tls=False, port=8440,
                  aps_host=None, aps_port=6308, use_tls_aps=True):
-        """ Connect your Odin Automation Hub"""
+        """ Connect your CloudBlue Commerce Instance (Hub)"""
         Hub.configure(hub_host, user, pwd, use_tls, port, aps_host, aps_port, use_tls_aps)
 
     def version(self):
@@ -59,8 +60,8 @@ def version(self):
 
     def install_frontend(self, source, oauth_key, oauth_secret, backend_url, settings=None,
                          network='proxy', hub_id=None, instance_only=False, experimental=False):
-        """ Install connector-frontend in Odin Automation Hub, --source can be http(s):// or
-        filepath"""
+        """ Install connector-frontend in the CloudBlue Commerce Instance (Hub),
+        --source can be http(s):// or filepath"""
 
         if backend_url.startswith('http://'):
             print("WARN: Make sure that the APS development mode enabled for http backend. "

apsconnectcli/config.py

@@ -15,7 +15,8 @@ def get_config():
     except IOError as e:
         if e.errno == 2:
             print("Could not find connected hub data. "
-                  "Please run the init-hub command to connect Odin Automation hub.")
+                  "Please run the init-hub command to connect to the "
+                  "CloudBlue Commerce instance (hub).")
         else:
             print("Could not open configuration file:\n{}".format(e))
         sys.exit(1)

setup.py

@@ -20,14 +20,14 @@
 
 setup(
     name='apsconnectcli',
-    author='Ingram Micro',
+    author='CloudBlue',
     version=VERSION,
     keywords='aps apsconnect connector automation',
     extras_require={
         ':python_version<="2.7"': ['backports.tempfile==1.0']},
     packages=['apsconnectcli'],
-    description='A command line tool for APS connector installation on Odin Automation in '
-                'the relaxed way.',
+    description='A command line tool that automates lifecycle management of APS packages '
+                'generated by CloudBlue Connect into the CloudBlue Commerce instance.',
     url='https://github.com/cloudblue/apsconnect-cli',
     license='Apache Software License',
     include_package_data=True,