Merge branch 'master' into upgrade/800/server_profile

Author: sijeesh

CHANGELOG.md

@@ -33,10 +33,14 @@ Resource data will be available with the resource object. This enhancement helps
 - Interconnect type
 - Internal link set
 - Logical enclosure
+- Logical interconnect
+- Logical interconnect group
+- Logical switch group
 - Managed SAN
 - SAS interconnect
 - SAS interconnect type
 - SAS logical interconnect
+- SAS logical interconnect group
 - Server hardware
 - Server hardware type
 - Server profile

endpoints-support.md

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ###
-# (C) Copyright (2012-2017) Hewlett Packard Enterprise Development LP
+# (C) Copyright (2012-2019) Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@
 from pprint import pprint
 
 from config_loader import try_load_from_file
-from hpOneView.exceptions import HPOneViewException
 from hpOneView.oneview_client import OneViewClient
 
 config = {
@@ -38,16 +37,21 @@
 
 # Try load config from a file (if there is a config file)
 config = try_load_from_file(config)
-
 oneview_client = OneViewClient(config)
+logical_interconnect_groups = oneview_client.logical_interconnect_groups
+interconnect_types = oneview_client.interconnect_types
 
 # Define the scope name to add the logical interconnect group to it
 scope_name = ""
 
-# Get the interconnect type named 'HP VC FlexFabric 10Gb/24-Port Module' and using the uri in the values for the fields
+interconnect_type_name = "Synergy 10Gb Interconnect Link Module"
+# Get the interconnect type by name and using the uri in the values for the fields
 # "permittedInterconnectTypeUri" and create a Logical Interconnect Group.
 # Note: If this type does not exist, select another name
-interconnect_type = oneview_client.interconnect_types.get_by('name', 'HP VC FlexFabric 10Gb/24-Port Module')[0]['uri']
+interconnect_type = oneview_client.interconnect_types.get_by_name(interconnect_type_name)
+if interconnect_type:
+    pprint(interconnect_type.data)
+    interconnect_type_url = interconnect_type.data["uri"]
 
 options = {
     "category": None,
@@ -76,7 +80,7 @@
                         }
                     ]
                 },
-                "permittedInterconnectTypeUri": interconnect_type
+                "permittedInterconnectTypeUri": interconnect_type_url
             },
             {
                 "logicalDownlinkUri": None,
@@ -193,83 +197,75 @@
     }
 }
 
-# Create a logical interconnect group
-print("Create a logical interconnect group")
-created_lig = oneview_client.logical_interconnect_groups.create(options)
-pprint(created_lig)
+# Get all, with defaults
+print("Get all Logical Interconnect Groups")
+ligs = logical_interconnect_groups.get_all()
+pprint(ligs)
+
+# Get by uri
+print("Get a Logical Interconnect Group by uri")
+lig_byuri = logical_interconnect_groups.get_by_uri(ligs[0]["uri"])
+pprint(lig_byuri.data)
 
 # Get the first 10 records, sorting by name descending, filtering by name
 print("Get the first Logical Interconnect Groups, sorting by name descending, filtering by name")
-ligs = oneview_client.logical_interconnect_groups.get_all(
+ligs = logical_interconnect_groups.get_all(
     0, 10, sort='name:descending', filter="\"'name'='OneView Test Logical Interconnect Group'\"")
 pprint(ligs)
 
 # Get Logical Interconnect Group by property
-lig = oneview_client.logical_interconnect_groups.get_by('name', 'OneView Test Logical Interconnect Group')[0]
+lig = logical_interconnect_groups.get_by('name', 'SYN-LIG')[0]
 print("Found lig by name: '%s'.\n  uri = '%s'" % (lig['name'], lig['uri']))
 
+# Get Logical Interconnect Group by scope_uris
+if oneview_client.api_version >= 600:
+    lig_by_scope_uris = logical_interconnect_groups.get_all(scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
+    if len(lig_by_scope_uris) > 0:
+        print("Found %d Logical Interconnect Groups" % (len(lig_by_scope_uris)))
+        i = 0
+        while i < len(lig_by_scope_uris):
+            print("Found Logical Interconnect Group by scope_uris: '%s'.\n  uri = '%s'" % (lig_by_scope_uris[i]['name'], lig_by_scope_uris[i]['uri']))
+            i += 1
+        pprint(lig_by_scope_uris)
+    else:
+        print("No Logical Interconnect Group found.")
+
+# Get logical interconnect group by name
+lig = logical_interconnect_groups.get_by_name(options["name"])
+if not lig:
+    # Create a logical interconnect group
+    print("Create a logical interconnect group")
+    lig = logical_interconnect_groups.create(options)
+    pprint(lig.data)
+
 # Update a logical interconnect group
 print("Update a logical interconnect group")
-lig_to_update = created_lig.copy()
+lig_to_update = lig.data.copy()
 lig_to_update["name"] = "Renamed Logical Interconnect Group"
-updated_lig = oneview_client.logical_interconnect_groups.update(lig_to_update)
-pprint(updated_lig)
-
-# Get all, with defaults
-print("Get all Logical Interconnect Groups")
-ligs = oneview_client.logical_interconnect_groups.get_all()
-pprint(ligs)
-
-# Get by Id
-try:
-    print("Get a Logical Interconnect Group by id")
-    lig_byid = oneview_client.logical_interconnect_groups.get('f0a0a113-ec97-41b4-83ce-d7c92b900e7c')
-    pprint(lig_byid)
-except HPOneViewException as e:
-    print(e.msg)
-
-# Get by uri
-try:
-    print("Get a Logical Interconnect Group by uri")
-    lig_byuri = oneview_client.logical_interconnect_groups.get(created_lig["uri"])
-    pprint(lig_byuri)
-except HPOneViewException as e:
-    print(e.msg)
+lig.update(lig_to_update)
+pprint(lig.data)
 
 # Performs a patch operation
-scope = oneview_client.scopes.get_by_name(scope_name)
-if scope:
-    print("\nPatches the logical interconnect group adding one scope to it")
-    updated_lig = oneview_client.logical_interconnect_groups.patch(updated_lig['uri'],
-                                                                   'replace',
-                                                                   '/scopeUris',
-                                                                   [scope['uri']])
-    pprint(updated_lig)
+if oneview_client.api_version <= 500:
+    scope = oneview_client.scopes.get_by_name(scope_name)
+    if scope:
+        print("\nPatches the logical interconnect group adding one scope to it")
+        updated_lig = lig.patch('replace',
+                                '/scopeUris',
+                                [scope['uri']])
+        pprint(updated_lig.data)
 
 # Get default settings
 print("Get the default interconnect settings for a logical interconnect group")
-lig_default_settings = oneview_client.logical_interconnect_groups.get_default_settings()
+lig_default_settings = lig.get_default_settings()
 pprint(lig_default_settings)
 
 # Get settings
 print("Gets the interconnect settings for a logical interconnect group")
-lig_settings = oneview_client.logical_interconnect_groups.get_settings(created_lig["uri"])
+lig_settings = lig.get_settings()
 pprint(lig_settings)
 
-# Get Logical Interconnect Group by scope_uris
-if oneview_client.api_version >= 600:
-    lig_by_scope_uris = oneview_client.logical_interconnect_groups.get_all(scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
-    if len(lig_by_scope_uris) > 0:
-        print("Found %d Logical Interconnect Groups" % (len(lig_by_scope_uris)))
-        i = 0
-        while i < len(lig_by_scope_uris):
-            print("Found Logical Interconnect Group by scope_uris: '%s'.\n  uri = '%s'" % (lig_by_scope_uris[i]['name'], lig_by_scope_uris[i]['uri']))
-            i += 1
-        pprint(lig_by_scope_uris)
-    else:
-        print("No Logical Interconnect Group found.")
-
 # Delete a logical interconnect group
 print("Delete the created logical interconnect group")
-oneview_client.logical_interconnect_groups.delete(updated_lig)
+lig.delete()
 print("Successfully deleted logical interconnect group")