Skip to content

Commit

Permalink
Merge pull request #53 from CenturyLinkCloud/fix_reserved_words
Browse files Browse the repository at this point in the history
[EDGEMEM-2127] Fix reserved words since python3.7
  • Loading branch information
EfrenRey authored Nov 15, 2022
2 parents a8e6bbd + 197e0ac commit b1372d1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/clc/APIv1/shell.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ def ParseArgs(self):
parser.add_argument('--v1-api-passwd', metavar='PASSWORD', help='V1 API password')
parser.add_argument('--v2-api-username', metavar='USERNAME', help='V2 API username')
parser.add_argument('--v2-api-passwd', metavar='PASSWORD', help='V2 API password')
parser.add_argument('--async', action="store_true", default=False, help='Return immediately after queueing long-running calls')
parser.add_argument('--async', action="store_true", dest='is_async', default=False, help='Return immediately after queueing long-running calls')
parser.add_argument('--quiet', '-q', action='count', help='Supress status output (repeat up to 2 times)')
parser.add_argument('--verbose', '-v', action='count', help='Increase verbosity')
parser.add_argument('--format', '-f', choices=['json','table','text','csv'], default='table', help='Output result format (table is default)')
Expand Down Expand Up @@ -709,7 +709,7 @@ def AddServerDisk(self):


def ServerActions(self,action):
clc.args.args.async = True # Force async - we can't current deal with multiple queued objects
clc.args.args.is_async = True # Force async - we can't current deal with multiple queued objects
r = self.Exec('clc.v1.Server.%s' % (action), { 'alias': self._GetAlias(), 'servers': clc.args.GetArgs().server },
cols=['RequestID','StatusCode','Message'])

Expand Down Expand Up @@ -898,7 +898,7 @@ def GetBlueprintsPackageUpload(self):


def PublishBlueprintsPackage(self):
clc.args.args.async = True
clc.args.args.is_async = True
if clc.args.args.os is None:
r = self.Exec('clc.v1.Blueprint.PackagePublishUI',
{ 'package': clc.args.args.package, 'classification': clc.args.args.type, 'visibility': clc.args.args.visibility },
Expand All @@ -919,7 +919,7 @@ def Exec(self,function,args=False,cols=None,supress_output=False):

# Output results
# TODO - how do we differentiate blueprints vs. queue RequestIDs?
if r is not None and 'RequestID' in r and not clc.args.args.async:
if r is not None and 'RequestID' in r and not clc.args.args.is_async:
r = clc.v1.output.RequestBlueprintProgress(r['RequestID'],self._GetLocation(),self._GetAlias(),clc.args.args.quiet)
cols = ['Server']

Expand Down
2 changes: 1 addition & 1 deletion src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

setup(
name = "clc-sdk",
version = "2.50",
version = "2.51",
packages = find_packages("."),

install_requires = ['prettytable','clint','argparse','requests'],
Expand Down

0 comments on commit b1372d1

Please sign in to comment.