Merge branch 'feature/amelioration' into 'develop'

Feature/amelioration

See merge request !14

src/actions/server.actions.js

@@ -45,7 +45,7 @@ function describe(serverid) {
   return dispatch => {
     const serverId =  parseInt(serverid, 10);
     dispatch(request(serverId));
-    return Zephir.v1.server.describe({serverid: serverId})
+    return Zephir.v1.server.describe({serverid: serverId, environment: true})
       .then(({response}) => {
         dispatch(success(response));
         return response;
@@ -154,10 +154,11 @@ export const SERVER_PEERING_CONF_GET_FAILURE = 'SERVER_PEERING_CONF_GET_FAILURE'
 function getPeeringConf(serverId) {
   return dispatch => {
     dispatch(request(serverId));
-    return Zephir.v1.server.peeringConf.get({ serverid: serverId })
-      .then(({response}) => {
-        dispatch(success(response));
-        return response;
+    return Zephir.v1.server.describe({serverid: serverId, peering: true})
+    .then(({response}) => {
+      response = response.peering;
+      dispatch(success(response));
+      return response;
       })
       .catch(error => {
         dispatch(failure(error));