Initial Changes

HewlettPackard · Jul 7, 2020 · 620d08f · 620d08f
1 parent 9078f85
commit 620d08f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/examples/oneview_ethernet_network.yml b/examples/oneview_ethernet_network.yml
@@ -58,23 +58,23 @@
           name: '{{ network_name }}'
       delegate_to: localhost
 
-    - name: Ensure ethernet network has no scopes
-      oneview_ethernet_network:
-        config: "{{ config }}"
-        state: present
-        data:
-          name: "{{ network_name }}"
-          scopeUris: []
-      delegate_to: localhost
-
-    - name: Ensure Ethernet Network has two scopes
-      oneview_ethernet_network:
-        config: "{{ config }}"
-        state: present
-        data:
-          name: "{{ network_name }}"
-          scopeUris: "{{ network_scope_uris }}"
-      delegate_to: localhost
+#    - name: Ensure ethernet network has no scopes
+#      oneview_ethernet_network:
+#        config: "{{ config }}"
+#        state: present
+#        data:
+#          name: "{{ network_name }}"
+#          scopeUris: []
+#      delegate_to: localhost
+#
+#    - name: Ensure Ethernet Network has two scopes
+#      oneview_ethernet_network:
+#        config: "{{ config }}"
+#        state: present
+#        data:
+#          name: "{{ network_name }}"
+#          scopeUris: "{{ network_scope_uris }}"
+#      delegate_to: localhost
 
     - name: Rename the Ethernet Network to 'Updated Ethernet Network'
       oneview_ethernet_network:

diff --git a/examples/oneview_fc_network.yml b/examples/oneview_fc_network.yml
@@ -17,11 +17,13 @@
 - hosts: all
   vars:
     config: "{{ playbook_dir }}/oneview_config.json"
+    contents: "{{lookup('file', config)}}"
     network_name: 'Ansible Test FC Network'
     network_scope_uris:
       - '/rest/scopes/d0324c4b-56c9-485b-b7dd-8f6218a4b5bb'
       - '/rest/scopes/9422ce05-dc39-4358-b723-c8c825eae412'
   tasks:
+
     - name: Create a Fibre Channel Network
       oneview_fc_network:
         config: "{{ config }}"
@@ -35,6 +37,10 @@
       delegate_to: localhost
       register: fc_network_1
 
+    - name: Display the api version present in config file
+      debug: 
+        var: contents.api_version
+
     - name: Do nothing with the Fibre Channel Network when no changes are provided
       oneview_fc_network:
         config: "{{ config }}"
@@ -65,6 +71,7 @@
         data:
           name: "{{ network_name }}"
           scopeUris: "{{ network_scope_uris }}"
+      when: contents.api_version >= 300 and contents.api_version <= 500
       delegate_to: localhost
 
     - name: Delete the Fibre Channel Network

diff --git a/examples/oneview_network_set.yml b/examples/oneview_network_set.yml
@@ -17,7 +17,7 @@
 - hosts: all
   vars:
     config: "{{ playbook_dir }}/oneview_config.json"
-    ethernet_network_1_name: 'Test Ethernet Network 1' # Define a Name of an Ethernet Network to add on the Network Set
+    ethernet_network_1_name: 'test' # Define a Name of an Ethernet Network to add on the Network Set
     ethernet_network_2_uri: '/rest/ethernet-networks/d7643aca-01e1-4fc0-a678-e1529ebd955d' # Define a URI of another Ethernet Network to add on the Network Set
     network_set_scope_uris:
       - /rest/scopes/483d4056-03a3-4eed-a606-e1d32e14dd61
@@ -31,21 +31,21 @@
           name: 'OneViewSDK Test Network Set'
           networkUris:
             - '{{ ethernet_network_1_name }}'  # can be a name
-            - '{{ ethernet_network_2_uri }}'   # or a URI
+#            - '{{ ethernet_network_2_uri }}'   # or a URI
           bandwidth:
             maximumBandwidth: 15000
             typicalBandwidth: 3000
       delegate_to: localhost
 
     # Scope update is only supported V300 and V500
-    - name: Update the Network set with two scopes
-      oneview_network_set:
-        config: "{{ config }}"
-        state: present
-        data:
-          name: OneViewSDK Test Network Set
-          scopeUris: "{{ network_set_scope_uris }}"
-      delegate_to: localhost
+#    - name: Update the Network set with two scopes
+#      oneview_network_set:
+#        config: "{{ config }}"
+#        state: present
+#        data:
+#          name: OneViewSDK Test Network Set
+#          scopeUris: "{{ network_set_scope_uris }}"
+#      delegate_to: localhost
 
     - name: Update the Network Set name to 'OneViewSDK Test Network Set - Renamed' and change the associated networks
       oneview_network_set:
@@ -58,6 +58,7 @@
             - '{{ ethernet_network_1_name }}'
       delegate_to: localhost
 
+
     - name: Delete the Network Set
       oneview_network_set:
         config: '{{ config }}'

diff --git a/examples/oneview_uplink_set.yml b/examples/oneview_uplink_set.yml
@@ -17,7 +17,7 @@
 - hosts: all
   vars:
     config: "{{ playbook_dir }}/oneview_config.json"
-    logical_interconnect_name: '<LIG>' # set the name of an existent logical interconnect to run this example
+    logical_interconnect_name: "LE-LIG" # set the name of an existent logical interconnect to run this example
     ethernet_networks:                     # set at least one ethernet network URI for this example
       - '/rest/ethernet-networks/21051893-e035-4c25-9dd0-8cd9cc953d25'
   tasks:
@@ -31,7 +31,7 @@
           # You can choose set the Logical Interconnect by logicalInterconnectUri or logicalInterconnectName
           logicalInterconnectName: "{{ logical_interconnect_name }}"                                    # option 1
           # logicalInterconnectUri: "/rest/logical-interconnects/461a9cef-beef-4916-8be1-926078ffb948"  # option 2
-          networkUris: "{{ ethernet_networks }}"
+          networkUris: []
           fcNetworkUris: []
           fcoeNetworkUris: []
           portConfigInfos: []