Skip to content

Make OCI's availability domain required (SC-59) #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasmoura merged 3 commits into from
May 31, 2021
Merged

Make OCI's availability domain required (SC-59) #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c96d22
Make OCI's availability domain required
TheRealFalcon May 25, 2021
544192f
[squash] rearranging call args and adding example
TheRealFalcon May 28, 2021
4069b03
[squash] Realized I can have my cake and eat it too!
TheRealFalcon May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/base_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def exercise_api(client: BaseCloud, image_id=None):
'zone': 'a',
},
pycloudlib.OCI: {
'availability_domain': os.environ.get('AVAILABILITY_DOMAIN'),
'compartment_id': os.environ.get('COMPARTMENT_ID')
},
pycloudlib.Openstack: {
Expand Down
12 changes: 7 additions & 5 deletions examples/oci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
"""


def demo(compartment_id):
def demo(availability_domain, compartment_id):
"""Show example of using the OCI library.

Connects to OCI and launches released image. Then runs
through a number of examples.
"""
client = pycloudlib.OCI(
'Oracle test',
availability_domain=availability_domain,
compartment_id=compartment_id,
)

Expand All @@ -46,8 +47,9 @@ def demo(compartment_id):

if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG)
if len(sys.argv) != 2:
print('Usage: oci.py <oracle_compartment_id>')
if len(sys.argv) != 3:
print('Usage: oci.py <availability_domain> <compartment_id>')
sys.exit(1)
passed_compartment_id = sys.argv[1]
demo(passed_compartment_id)
passed_availability_domain = sys.argv[1]
passed_compartment_id = sys.argv[2]
demo(passed_availability_domain, passed_compartment_id)
11 changes: 7 additions & 4 deletions pycloudlib/oci/cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ class OCI(BaseCloud):
_type = 'oci'

def __init__(
self, tag, timestamp_suffix=True, compartment_id=None,
config_path='~/.oci/config',
self, tag, timestamp_suffix=True, *, availability_domain,
compartment_id=None, config_path='~/.oci/config'
):
"""
Initialize the connection to OCI.
Expand All @@ -35,9 +35,13 @@ def __init__(
tag
compartment_id: A compartment found at
https://console.us-phoenix-1.oraclecloud.com/a/identity/compartments
availability_domain: One of the availability domains from:
'oci iam availability-domain list'
config_path: Path of OCI config file
"""
super().__init__(tag, timestamp_suffix)
self.availability_domain = availability_domain

if not compartment_id:
command = ['oci', 'iam', 'compartment', 'get']
exception_text = (
Expand Down Expand Up @@ -182,7 +186,6 @@ def launch(self, image_id, instance_type='VM.Standard2.1', user_data=None,
subnet = self.network_client.list_subnets(
self.compartment_id, vcn_id=vcn_id).data[0]
subnet_id = subnet.id
availability_domain = subnet.availability_domain

metadata = {
'ssh_authorized_keys': self.key_pair.public_key_content,
Expand All @@ -193,7 +196,7 @@ def launch(self, image_id, instance_type='VM.Standard2.1', user_data=None,

instance_details = oci.core.models.LaunchInstanceDetails(
display_name=self.tag,
availability_domain=availability_domain,
availability_domain=self.availability_domain,
compartment_id=self.compartment_id,
shape=instance_type,
subnet_id=subnet_id,
Expand Down