Added VMware copyright headers

caspyr/blueprint.py

@@ -1,3 +1,8 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
 """Module for interacting with Blueprints.
 """
 
@@ -54,10 +59,7 @@ def list(session):
         uri = '/blueprint/api/blueprints/'
         data = []
         j = session._request(f'{session.baseurl}{uri}')
-        for i in j['links']:
-            i = os.path.split(i)[1]
-            data.append({"id": i})
-        return data
+        return j['objects']
 
     @classmethod
     def describe(cls, session, blueprint_id):
@@ -74,7 +76,7 @@ def describe(cls, session, blueprint_id):
         """
 
         uri = f'/blueprint/api/blueprints/{blueprint_id}'
-        return cls(session._request(f'{session.baseurl}{uri}'))
+        return cls(session._request(f'{session.baseurl}{uri}')[''])
 
     @staticmethod
     def get_inputs(session, blueprint_id):

caspyr/cloudaccount.py

@@ -1,3 +1,8 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
 from abc import ABCMeta, abstractmethod
 
 
@@ -72,7 +77,7 @@ def delete(session, uri):
     @staticmethod
     @abstractmethod
     def update(session, id, payload):
-        uri = f'/iaas/cloud-accounts/{id}'
+        uri = f'/iaas/api/cloud-accounts/{id}'
         return session._request(url=f'{session.baseurl}{uri}',
                                 request_method='PATCH',
                                 payload=payload
@@ -88,17 +93,17 @@ def __init__(self, cloudaccount):
 
     @classmethod
     def list(cls, session):
-        uri = '/iaas/cloud-accounts'
+        uri = '/iaas/api/cloud-accounts'
         return super().list(session, uri)
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/cloud-accounts/{id}'
+        uri = f'/iaas/api/cloud-accounts/{id}'
         return cls(super().describe(session, uri))
 
     @classmethod
     def unregister(cls, session, id):
-        uri = f'/iaas/cloud-accounts/{id}'
+        uri = f'/iaas/api/cloud-accounts/{id}'
         return super().unregister(session, uri)
 
     @classmethod
@@ -120,17 +125,17 @@ def __init__(self, cloudaccount):
 
     @classmethod
     def list(cls, session):
-        uri = '/iaas/cloud-accounts-aws'
+        uri = '/iaas/api/cloud-accounts-aws'
         return super().list(session, uri)['content']
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/cloud-accounts-aws/{id}'
+        uri = f'/iaas/api/cloud-accounts-aws/{id}'
         return cls(super().describe(session, uri))
 
     @classmethod
     def unregister(cls, session, id):
-        uri = f'/iaas/cloud-accounts-aws/{id}'
+        uri = f'/iaas/api/cloud-accounts-aws/{id}'
         return super().unregister(session, uri)
 
     @classmethod
@@ -148,7 +153,7 @@ def create(cls,
                create_zone=False,
                description=None
                ):
-        uri = '/iaas/cloud-accounts-aws'
+        uri = '/iaas/api/cloud-accounts-aws'
         payload = {
             "name": name,
             "description": description,
@@ -164,17 +169,17 @@ class CloudAccountAzure(Base):
 
     @classmethod
     def list(cls, session):
-        uri = '/iaas/cloud-accounts-azure'
+        uri = '/iaas/api/cloud-accounts-azure'
         return super().list(session, uri)['content']
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/cloud-accounts-azure/{id}'
+        uri = f'/iaas/api/cloud-accounts-azure/{id}'
         return cls(super().describe(session, uri))
 
     @classmethod
     def unregister(cls, session, id):
-        uri = f'/iaas/cloud-accounts-azure/{id}'
+        uri = f'/iaas/api/cloud-accounts-azure/{id}'
         return super().unregister(session, uri)
 
     @classmethod
@@ -204,25 +209,25 @@ def create(cls,
             "regionIds": [regions],
             "createDefaultZones": create_zone
         }
-        uri = '/iaas/cloud-accounts-azure'
+        uri = '/iaas/api/cloud-accounts-azure'
         return cls(super().create(session, uri=uri, payload=payload))
 
 
 class CloudAccountvSphere(Base):
 
     @classmethod
     def list(cls, session):
-        uri = '/iaas/cloud-accounts-vsphere'
+        uri = '/iaas/api/cloud-accounts-vsphere'
         return super().list(session, uri)
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/cloud-accounts-vsphere/{id}'
+        uri = f'/iaas/api/cloud-accounts-vsphere/{id}'
         return super().describe(session, uri)
 
     @classmethod
     def unregister(cls, session, id):
-        uri = f'/iaas/cloud-accounts-vsphere/{id}'
+        uri = f'/iaas/api/cloud-accounts-vsphere/{id}'
         return super().unregister(session, uri)
 
     @classmethod
@@ -266,7 +271,7 @@ def create(cls,
         :rtype: [type]
         """
 
-        uri = '/iaas/cloud-accounts-vsphere'
+        uri = '/iaas/api/cloud-accounts-vsphere'
         payload = {
             "name": name,
             "description": description,
@@ -286,17 +291,17 @@ class CloudAccountNSXT(Base):
 
     @classmethod
     def list(cls, session):
-        uri = '/iaas/cloud-accounts-nsx-t'
+        uri = '/iaas/api/cloud-accounts-nsx-t'
         return super().list(session, uri)['content']
 
     @staticmethod
     def describe(session, id):
-        uri = f'/iaas/cloud-accounts-nsx-t/{id}'
+        uri = f'/iaas/api/cloud-accounts-nsx-t/{id}'
         return super().describe(session, uri)
 
     @classmethod
     def unregister(cls, session, id):
-        uri = f'/iaas/cloud-accounts-nsx-t/{id}'
+        uri = f'/iaas/api/cloud-accounts-nsx-t/{id}'
         return super().unregister(session, uri)
 
     @classmethod
@@ -314,7 +319,7 @@ def create(cls,
                password,
                description=None
                ):
-        uri = '/iaas/cloud-accounts-nsx-t/'
+        uri = '/iaas/api/cloud-accounts-nsx-t/'
         payload = {
             "name": name,
             "description": description,

caspyr/codestream.py

@@ -1,5 +1,9 @@
-import sys
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
 
+import sys
 import requests
 
 

caspyr/datacollector.py

@@ -1,10 +1,15 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
 class DataCollector(object):
     def __init__(self, rdc):
         pass
 
     @staticmethod
     def list(session):
-        uri = '/iaas/data-collectors/'
+        uri = '/iaas/api/data-collectors/'
         data = []
         j = session._request(f'{session.baseurl}{uri}')['content']
         for i in j:
@@ -16,12 +21,25 @@ def list(session):
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/data-collectors/{id}'
+        uri = f'/iaas/api/data-collectors/{id}'
         return session._request(f'{session.baseurl}{uri}')
 
     @staticmethod
     def delete(session, id):
-        uri = f'/iaas/data-collectors/{id}'
+        uri = f'/iaas/api/data-collectors/{id}'
         return session._request(f'{session.baseurl}{uri}',
                                 request_method='DELETE'
                                 )
+
+    @staticmethod
+    def request_otk(session):
+        uri = '/api/otk-v3'
+        payload = {
+                   "url": "https://api.mgmt.cloud.vmware.com",
+                   "service": "cloud_assembly"
+                   }
+        i = session._request(f'{session.baseurl}{uri}',
+                             request_method='POST',
+                             payload=payload
+                             )
+        return i['key']

caspyr/deployment.py

@@ -1,3 +1,9 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
+
 class Deployment(object):
     """
     Classes for Cloud Zone methods.

caspyr/fabric.py

@@ -1,3 +1,8 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
 """
 The Fabric module contains all the classes and methods required to get the
 underlying information for creating Image Mappings, Flavor Mappings, Network
@@ -35,7 +40,7 @@ def describe(cls, session, image, region):
         :rtype: Image
         """
 
-        uri = f'/iaas/fabric-images?$filter=(name eq \'{image}\') and (externalRegionId eq \'{region}\')'
+        uri = f'/iaas/api/fabric-images?$filter=(name eq \'{image}\') and (externalRegionId eq \'{region}\')'
 
         j = session._request(f'{session.baseurl}{uri}')['content'][0]
         return cls(j)
@@ -68,7 +73,7 @@ def list(session):
         :type session: Session
         :return: Returns a list of storage accounts.
         """
-        uri = f'/iaas/fabric-azure-storage-account'
+        uri = f'/iaas/api/fabric-azure-storage-account'
         return session._request(f'{session.baseurl}{uri}')['content']
 
     @classmethod
@@ -119,23 +124,23 @@ def list(session):
         :return: [description]
         :rtype: [type]
         """
-        uri = f'/iaas/fabric-networks'
+        uri = f'/iaas/api/fabric-networks'
         return session._request(f'{session.baseurl}{uri}')['content']
 
     @classmethod
     def list_by_region(cls, session, region="*"):
-        uri = f'/iaas/fabric-networks?$filter=externalRegionId eq {region}'
+        uri = f'/iaas/api/fabric-networks?$filter=externalRegionId eq {region}'
         return session._request(f'{session.baseurl}{uri}')['content']
 
     @classmethod
     def describe_by_name(cls, session, name, region="*"):
-        uri = (f'/iaas/fabric-networks?$filter=(name eq {name}) and '
+        uri = (f'/iaas/api/fabric-networks?$filter=(name eq {name}) and '
                '(externalRegionId eq {region})')
         return cls(session._request(f'{session.baseurl}{uri}')['content'])
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/fabric-networks/{id}'
+        uri = f'/iaas/api/fabric-networks/{id}'
         return cls(session._request(f'{session.baseurl}{uri}'))
 
     @classmethod
@@ -150,7 +155,7 @@ def update(cls, session, id, tags):
         :return: [description]
         :rtype: [type]
         """
-        uri = f'/iaas/fabric-network/{id}'
+        uri = f'/iaas/api/fabric-network/{id}'
         payload = {
             tags
         }
@@ -178,5 +183,5 @@ def __init__(self, flavor):
 
     @staticmethod
     def describe(session):
-        uri = f'/iaas/fabric-flavors'
+        uri = f'/iaas/api/fabric-flavors'
         print(session._request(f'{session.baseurl}{uri}')['content'][0])

caspyr/iaas.py

@@ -1,21 +1,26 @@
+# Cloud Automation Services SDK for Python
+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.
+
+# SPDX-License-Identifier: Apache-2.0
+
 class Network(object):
     def __init__(self, network):
         pass
 
     @staticmethod
     def list(session):
-        uri = f'/iaas/networks'
+        uri = f'/iaas/api/networks'
         j = session._request(f'{session.baseurl}{uri}')
         return j['content']
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/networks/{id}'
+        uri = f'/iaas/api/networks/{id}'
         return cls(session._request(f'{session.baseurl}{uri}'))
 
     @staticmethod
     def delete(session, id):
-        uri = f'/iaas/networks/{id}'
+        uri = f'/iaas/api/networks/{id}'
         return session._request(f'{session.baseurl}{uri}',
                                 request_method='DELETE'
                                 )
@@ -27,13 +32,13 @@ def __init__(self):
 
     @staticmethod
     def list(session):
-        uri = f'/iaas/machines'
+        uri = f'/iaas/api/machines'
         j = session._request(f'{session.baseurl}{uri}')
         return j['content']
 
     @classmethod
     def describe(cls, session, id):
-        uri = f'/iaas/machines/{id}'
+        uri = f'/iaas/api/machines/{id}'
         return session._request(f'{session.baseurl}{uri}')
 
     @staticmethod
@@ -66,14 +71,14 @@ def get_ip(session,
 
     @staticmethod
     def delete(session, id):
-        uri = f'/iaas/machines/{id}'
+        uri = f'/iaas/api/machines/{id}'
         session._request(f'{session.baseurl}{uri}',
                          request_method='DELETE'
                          )
 
     @staticmethod
     def find_by_user(session, user):
-        uri = (f"/iaas/machines?$filter=(((type eq 'VM_GUEST') and "
+        uri = (f"/iaas/api/machines?$filter=(((type eq 'VM_GUEST') and "
                f"(lifecycleState ne 'RETIRED')) and "
                f"(tenantLinks.item eq "
                f"'/owner/provisioning/auth/csp/users/{user}'))"
@@ -87,7 +92,7 @@ def list_orphaned(session):
 
     @staticmethod
     def unregister(session, uri):
-        uri = f'/provisioning/uerp{uri}'
+        uri = f'/provisioning/uerp/{uri}'
         payload = session._request(f'{session.baseurl}{uri}')
         payload['customProperties']['__groupResourcePlacementLink'] = ""
         return session._request(f'{session.baseurl}{uri}',