Incorporated reiew comments for Api600/ScopeUi changes

Author: AnushaY1916

examples/enclosures.py

@@ -159,10 +159,14 @@
 
 try:
     # Get Enclosure by scope_uris
-    if oneview_client.api_version == 600:
+    if oneview_client.api_version >= 600:
         enclosures_by_scope_uris = oneview_client.enclosures.get_all(scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
         if len(enclosures_by_scope_uris) > 0:
-            print("Found Enclosures by scope_uris: '%s'.\n  uri = '%s'" % (enclosures_by_scope_uris[0]['name'], enclosures_by_scope_uris[0]['uri']))
+            print("Found %d Enclosures" % (len(enclosures_by_scope_uris)))
+            i = 0
+            while i < len(enclosures_by_scope_uris):
+                print("Found Enclosures by scope_uris: '%s'.\n  uri = '%s'" % (enclosures_by_scope_uris[i]['name'], enclosures_by_scope_uris[i]['uri']))
+                i += 1
             pprint(enclosures_by_scope_uris)
         else:
             print("No Enclosures Group found.")

examples/logical_interconnect_groups.py

@@ -257,10 +257,14 @@
 pprint(lig_settings)
 
 # Get Logical Interconnect Group by scope_uris
-if oneview_client.api_version == 600:
+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 Logical Interconnect Group by scope_uris: '%s'.\n  uri = '%s'" % (lig_by_scope_uris[0]['name'], lig_by_scope_uris[0]['uri']))
+        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.")

examples/sas_logical_interconnect_groups.py

@@ -102,11 +102,15 @@
 print("\n   '{name}' at uri: {uri}".format(**sas_lig_found_by_name[0]))
 
 # Get SAS Interconnect Group by scope_uris
-if oneview_client.api_version == 600:
+if oneview_client.api_version >= 600:
     sas_lig_by_scope_uris = oneview_client.sas_logical_interconnect_groups.get_all(
         scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
     if len(sas_lig_by_scope_uris) > 0:
-        print("Found SAS Interconnect Group by scope_uris: '%s'.\n  uri = '%s'" % (sas_lig_by_scope_uris[0]['name'], sas_lig_by_scope_uris[0]['uri']))
+        print("found %d SAS Interconnect Groups" % (len(sas_lig_by_scope_uris)))
+        i = 0
+        while i < len(sas_lig_by_scope_uris):
+            print("Found SAS Interconnect Group by scope_uris: '%s'.\n  uri = '%s'" % (sas_lig_by_scope_uris[i]['name'], sas_lig_by_scope_uris[i]['uri']))
+            i += 1
         pprint(sas_lig_by_scope_uris)
     else:
         print("No SAS Interconnect Group found.")

examples/server_profile_templates.py

@@ -110,12 +110,16 @@
 print(available_networks)
 
 # Get Server Profile Template by scope_uris
-if oneview_client.api_version == 600:
+if oneview_client.api_version >= 600:
     server_profile_templates_by_scope_uris = oneview_client.server_profile_templates.get_all(
         scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
     if len(server_profile_templates_by_scope_uris) > 0:
-        print("Found Server Profile Template Group by scope_uris: '%s'.\n  uri = '%s'" % (server_profile_templates_by_scope_uris[0]['name'],
-                                                                                          server_profile_templates_by_scope_uris[0]['uri']))
+        print("Found %d Server profile Templates" % (len(server_profile_templates_by_scope_uris)))
+        i = 0
+        while i < len(server_profile_templates_by_scope_uris):
+            print("Found Server Profile Template Group by scope_uris: '%s'.\n  uri = '%s'" % (server_profile_templates_by_scope_uris[i]['name'],
+                                                                                              server_profile_templates_by_scope_uris[i]['uri']))
+            i += 1
         pprint(server_profile_templates_by_scope_uris)
     else:
         print("No Server Profile Template Group found.")

examples/server_profiles.py

@@ -170,15 +170,14 @@
     print(e.msg)
 
 try:
-    # Get Server Profile by scope_uris
-    if oneview_client.api_version == 600:
+    # Get the all Ethernet networks associated with a server hardware type, enclosure group and scopeuris
+    if oneview_client.api_version >= 600:
         enclosure_group_uri = "/rest/enclosure-groups/8cf8fd62-ad9f-4946-abf7-6dac9cb59253"
         server_hardware_type_uri = "/rest/server-hardware-types/B342B5D4-387D-4DEB-ADBB-9D7256DF2A47"
         available_networks = oneview_client.server_profiles.get_available_networks(enclosureGroupUri=enclosure_group_uri,
                                                                                    serverHardwareTypeUri=server_hardware_type_uri, view='Ethernet',
                                                                                    scope_uris="\"'/rest/scopes/3bb0c754-fd38-45af-be8a-4d4419de06e9'\"")
         if len(available_networks) > 0:
-            print("Found Server Profiles by scope_uris: .\n  uri = '%s'" % available_networks['uri'])
             pprint(available_networks)
         else:
             print("No Server Profiles Group found.")