Merge pull request #20 from robertcsapo/iss19

fixes #19

Author: austinMarcos

LM-4502/03-python/apic_em_code_1.py

@@ -24,7 +24,9 @@ def get_token(url):
     # Combine URL, API call and parameters variables
     url += api_call
 
-    response = requests.post(url, data=json.dumps(payload), headers=headers, verify=False).json()
+    response = requests.post(url, data=json.dumps(payload), headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
 
     # Return authentication token from respond body
     return response["response"]["serviceTicket"]
@@ -40,16 +42,18 @@ def get_device_id(token, url):
 
     # Combine URL, API call and parameters variables
     url += api_call
-	
-    response = requests.get(url, headers=headers, verify=False).json()
+
+    response = requests.get(url, headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
 
     # Iterate over the response and find first device with access role.
     # Return ID number of the first device matching the criteria
     for item in response['response']:
         if item['role'] == 'ACCESS':
             return item['id']
 
-			
+
 def get_config(token, url, id):
 
     # Define API Call. To get specific device's configuration
@@ -62,7 +66,9 @@ def get_config(token, url, id):
     # Combine URL, API call variables
     url += api_call
 
-    response = requests.get(url, headers=headers, verify=False).json()
+    response = requests.get(url, headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
 
     # Create a file in present working directory
     file = open('access_host_1.txt', 'w')

LM-4502/03-python/apic_em_code_2.py

@@ -24,12 +24,14 @@ def get_token(url):
     # Combine URL, API call and parameters variables
     url += api_call
 
-    response = requests.post(url, data=json.dumps(payload), headers=headers, verify=False).json()
+    response = requests.post(url, data=json.dumps(payload), headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
 
     # Return authentication token from respond body
     return response["response"]["serviceTicket"]
 
-	
+
 def get_device_id(token, url):
 
     # Define API Call
@@ -40,50 +42,54 @@ def get_device_id(token, url):
 
     # Combine URL, API call and parameters variables
     url += api_call
-	
-    response = requests.get(url, headers=headers, verify=False).json()
+
+    response = requests.get(url, headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
 
     # Iterate over the response and find first device with access role.
     # Return ID number of the first device matching the criteria
     for item in response['response']:
         if item['role'] == 'ACCESS':
             return item['id']
 
-			
+
 def get_config(token, url, id):
     #Define API Call. To get specific device's configuration
     #we will need to add device's ID in the API call
     api_call = "/network-device/" + id +"/config"
-	
+
     #Header information
     headers = {"X-AUTH-TOKEN" : token}
-	
+
     # Combine URL, API call variables
     url +=api_call
-	
-    response = requests.get(url, headers=headers, verify=False).json()
-    
+
+    response = requests.get(url, headers=headers, verify=False)
+    response.raise_for_status()
+    response = response.json()
+
 	#Find the hostname in the response body and save it to a hostname variable
     hostname = re.findall('hostname\s(.+?)\s', response['response'])[0]
-    
+
 	#Create a date_time variable which will hold current time
     date_time = datetime.datetime.now()
-    
+
 	#Create a variable which will hold the hostname combined with the date and time
     #The format will be hostname_year_month_day_hour.minute.second
     file_name = hostname + '_' + str(date_time.year) + '_' + str(date_time.month) + '_' + \
                str(date_time.day) + '_' + str(date_time.hour) + '.' + str(date_time.minute) + \
                 '.' + str(date_time.second)
 
     file = open(file_name+'.txt', 'w')
-    
+
 	#Write response body to the file
     file.write(response['response'])
-    
+
 	#Close the file when writing is complete
     file.close()
 
-	
+
 # Assign obtained authentication token to a variable. Provide APIC-EM's
 # URL address
 auth_token = get_token(apic_em_ip)

LM-4502/04-mission/apic_em_mission.py

@@ -41,6 +41,7 @@ def getTicket():
 
     # Performs a POST on the specified url to get the service ticket
     response = requests.post(url, data=json.dumps(payload), headers=header, verify=False)
+    response.raise_for_status()
 
     print(response)
 
@@ -74,6 +75,7 @@ def getTopology(ticket):
 
     # this statement performs a GET on the specified network device url
     response = requests.get(url, headers=header, verify=False)
+    response.raise_for_status()
 
     # convert data to json format.
     r_json = response.json()
@@ -127,6 +129,7 @@ def get_roomID():
 
     # this statement performs a GET on the specified network device url
     response = requests.get(url, headers=header, verify=False)
+    response.raise_for_status()
     r_json = response.json()
 
     for item in r_json["items"]:
@@ -159,6 +162,7 @@ def post_spark(text, room_id):
     # this statement performs a GET on the specified network device url
     response = requests.post(url, data=json.dumps(
         payload), headers=header, verify=False)
+    response.raise_for_status()
 
     print("\nCheck the Spark Room.  You've just posted a message!")