LoadTesting

Add 2017 imagery

9/6/2018 7:40:36 AM

Details

diff --git a/qsi/locustfile_exportImage.py b/qsi/locustfile_exportImage.py
index 065e21c..ec438e0 100644
--- a/qsi/locustfile_exportImage.py
+++ b/qsi/locustfile_exportImage.py
@@ -21,6 +21,7 @@ routes = {
     "2012": "/arcgis/rest/services/NAIP_2012/NAIP_2012_SL/ImageServer/",
     "2014": "/arcgis/rest/services/NAIP_2014/NAIP_2014_SL/ImageServer/",
     "2016": "/arcgis/rest/services/NAIP_2016/NAIP_2016_SL/ImageServer/",
+    "2017": "/arcgis/rest/services/NAIP_2016/NAIP_2017_SL/ImageServer/"
 }
 
 class UserBehavior(TaskSet):
@@ -54,8 +55,8 @@ class UserBehavior(TaskSet):
             'dpi': 96,
             'transparent': 'true',
             'bbox': ','.join(map(str, [x1, y1, x2, y2])),
-            'bboxSR': 2992,
-            'imageSR': 2992,
+            'bboxSR': 3857,
+            'imageSR': 3857,
             'size': '1908,612',
             # 'format': 'png8'
         }
@@ -71,38 +72,42 @@ class UserBehavior(TaskSet):
         qstr = qstr[0:-1]
         self.client.get(route+'exportImage'+qstr, name=route)
 
-    @task(3)
+    @task(2)
     def service1(self):
         self.baseQuery(routes['1995'])
 
-    @task(3)
+    @task(2)
     def service2(self):
         self.baseQuery(routes['2000'])
 
-    @task(3)
+    @task(2)
     def service3(self):
         self.baseQuery(routes['2005'])
 
-    @task(3)
+    @task(2)
     def service4(self):
         self.baseQuery(routes['2009'])
 
-    @task(3)
+    @task(2)
     def service5(self):
         self.baseQuery(routes['2011'])
 
-    @task(5)
+    @task(3)
     def service5(self):
         self.baseQuery(routes['2012'])
 
-    @task(10)
+    @task(7)
     def service5(self):
         self.baseQuery(routes['2014'])
 
-    @task(70)
+    @task(10)
     def service5(self):
         self.baseQuery(routes['2016'])
 
+    @task(70)
+    def service5(self):
+        self.baseQuery(routes['2017'])
+
 class WebsiteUser(HttpLocust):
     host = service_host
     task_set = UserBehavior
diff --git a/qsi/locustfile_tileImage.py b/qsi/locustfile_tileImage.py
index b1151cc..9893b6e 100644
--- a/qsi/locustfile_tileImage.py
+++ b/qsi/locustfile_tileImage.py
@@ -23,6 +23,7 @@ routes = {
     "2012": "/arcgis/rest/services/NAIP_2012/NAIP_2012_WM/ImageServer/",
     "2014": "/arcgis/rest/services/NAIP_2014/NAIP_2014_WM/ImageServer/",
     "2016": "/arcgis/rest/services/NAIP_2016/NAIP_2016_WM/ImageServer/",
+    "2017": "/arcgis/rest/services/NAIP_2016/NAIP_2017_WM/ImageServer/",
 }
 
 # Convert lat, lon, and zoom to tile numbers
@@ -74,38 +75,42 @@ class UserBehavior(TaskSet):
 
         self.client.get(route+'tile/'+ str(zoom) + "/" + str(ytile) + "/" + str(xtile), name=route)
 
-    @task(3)
+    @task(2)
     def service1(self):
         self.baseQuery(routes['1995'])
 
-    @task(3)
+    @task(2)
     def service2(self):
         self.baseQuery(routes['2000'])
 
-    @task(3)
+    @task(2)
     def service3(self):
         self.baseQuery(routes['2005'])
 
-    @task(3)
+    @task(2)
     def service4(self):
         self.baseQuery(routes['2009'])
 
-    @task(3)
+    @task(2)
     def service5(self):
         self.baseQuery(routes['2011'])
 
-    @task(5)
+    @task(3)
     def service5(self):
         self.baseQuery(routes['2012'])
 
-    @task(10)
+    @task(7)
     def service5(self):
         self.baseQuery(routes['2014'])
 
-    @task(70)
+    @task(10)
     def service5(self):
         self.baseQuery(routes['2016'])
 
+    @task(70)
+    def service5(self):
+        self.baseQuery(routes['2017'])
+
 class WebsiteUser(HttpLocust):
     host = service_host
     task_set = UserBehavior
diff --git a/results/.DS_Store b/results/.DS_Store
index 30e9ed6..09d02be 100644
Binary files a/results/.DS_Store and b/results/.DS_Store differ