fixing endpoints nomenclature

README.md

@@ -159,7 +159,7 @@ A team using a different backend will need to provide the code to enable utiliza
 
 ##### Endpoint
 
-Steps for adding the data to the result of `/api/cpt/v1/jobs` endpoint
+Steps for adding the data to the result of `/api/v1/cpt/jobs` endpoint
 
 1. Create a custom mapper that will query your data backend and do the appropriate transformations for the data to match the fields described above.
 This Mapper should always receive:
@@ -168,7 +168,7 @@ This Mapper should always receive:
 This mapper should return
    * A pandas DataFrame
 
-2. In the `/api/cpt/v1/jobs` endpoint add the entry to the [`products`](https://github.com/cloud-bulldozer/cpt-dashboard/blob/1ce837ae17e0d3fa63f59c751078990b018905dc/backend/app/api/v1/endpoints/cpt/cptJobs.py#L12) dictionary that has the different data sources configured, the endpoint should query all configured mappers and append the resulting DataFrames to the overall response.
+2. In the `/api/v1/cpt/jobs` endpoint add the entry to the [`products`](https://github.com/cloud-bulldozer/cpt-dashboard/blob/1ce837ae17e0d3fa63f59c751078990b018905dc/backend/app/api/v1/endpoints/cpt/cptJobs.py#L12) dictionary that has the different data sources configured, the endpoint should query all configured mappers and append the resulting DataFrames to the overall response.
 
 ##### Frontend
 

backend/app/api/v1/endpoints/cpt/cptJobs.py

@@ -17,7 +17,7 @@
             "hce": hceMapper
            }
 
-@router.get('/api/cpt/v1/jobs',
+@router.get('/api/v1/cpt/jobs',
             summary="Returns a job list from all the products.",
             description="Returns a list of jobs in the specified dates. \
             If not dates are provided the API will default the values. \

backend/app/api/v1/endpoints/ocp/graph.py

@@ -13,7 +13,7 @@
 
 """
 """
-@router.get('/api/ocp/v1/graph/trend/{version}/{count}/{benchmark}')
+@router.get('/api/v1/ocp/graph/trend/{version}/{count}/{benchmark}')
 async def trend(benchmark: str,count: int,version: str):
     index = "ripsaw-kube-burner*"
     meta = {}
@@ -54,7 +54,7 @@ async def trend(benchmark: str,count: int,version: str):
 diff_cpu - Will accept the version, prev_version , count, benchmark and namespace to diff trend CPU
 data.
 """
-@router.get('/api/ocp/v1/graph/trend/{version}/{prev_version}/{count}/{benchmark}/cpu/{namespace}')
+@router.get('/api/v1/ocp/graph/trend/{version}/{prev_version}/{count}/{benchmark}/cpu/{namespace}')
 async def diff_cpu(namespace: str, benchmark: str, count: int, version: str, prev_version: str):
     aTrend = await trend_cpu(namespace,benchmark,count,version)
     bTrend = await trend_cpu(namespace,benchmark,count,prev_version)
@@ -64,7 +64,7 @@ async def diff_cpu(namespace: str, benchmark: str, count: int, version: str, pre
 trend_cpu - Will accept the version, count, benchmark and namespace to trend CPU
 data.
 """
-@router.get('/api/ocp/v1/graph/trend/{version}/{count}/{benchmark}/cpu/{namespace}')
+@router.get('/api/v1/ocp/graph/trend/{version}/{count}/{benchmark}/cpu/{namespace}')
 async def trend_cpu(namespace: str, benchmark: str, count: int, version: str):
     index = "ripsaw-kube-burner*"
     meta = {}
@@ -109,7 +109,7 @@ def parseCPUResults(data: dict):
         res.append(dat)
     return res
 
-@router.get('/api/ocp/v1/graph/{uuid}')
+@router.get('/api/v1/ocp/graph/{uuid}')
 async def graph(uuid: str):
     index = ""
     meta = await getMetadata(uuid, 'ocp.elasticsearch')

backend/app/api/v1/endpoints/ocp/ocpJobs.py

@@ -10,7 +10,7 @@
 
 
 
-@router.get('/api/ocp/v1/jobs',
+@router.get('/api/v1/ocp/jobs',
             summary="Returns a job list",
             description="Returns a list of jobs in the specified dates. \
             If not dates are provided the API will default the values. \

backend/app/api/v1/endpoints/ocp/results.py

@@ -6,7 +6,7 @@
 router = APIRouter()
 
 
-@router.get('/api/ocp/v1/jobs/{ci}/{job_id}',
+@router.get('/api/v1/ocp/jobs/{ci}/{job_id}',
             summary="Returns the details of a specified Job.")
 async def results_for_job(
         ci: str = Path(..., description="Name of the CI system tha tthe job belongs to.", examples=["PROW", "JENKINS"]),

frontend/src/store/Shared.js

@@ -7,10 +7,10 @@ export const getUrl = () => {
 
 export const BASE_URL = getUrl()
 
-export const OCP_JOBS_API_V1 = "/api/ocp/v1/jobs"
-export const OCP_GRAPH_API_V1 = "/api/ocp/v1/graph"
+export const OCP_JOBS_API_V1 = "/api/v1/ocp/jobs"
+export const OCP_GRAPH_API_V1 = "/api/v1/ocp/graph"
 
-export const CPT_JOBS_API_V1 = "/api/cpt/v1/jobs"
+export const CPT_JOBS_API_V1 = "/api/v1/cpt/jobs"
 
 export const QUAY_JOBS_API_V1 = "/api/v1/quay/jobs"
 export const QUAY_GRAPH_API_V1 = "/api/v1/quay/graph"