Name changes for the agent package.

Update smoke tests

Change-Id: I39d24cf74ae0c6278fdc9d47b7a20ebf8ae04bf6

Berksfile

@@ -9,7 +9,7 @@ cookbook 'devstack', path: './cookbooks/devstack'
 cookbook 'ds-build', path: './cookbooks/ds-build'
 cookbook 'mon_api', git: 'https://github.com/hpcloud-mon/cookbooks-mon_api'
 cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka'
-cookbook 'mon_agent', git: 'https://github.com/hpcloud-mon/cookbooks-mon_agent'
+cookbook 'monasca_agent', git: 'https://github.com/stackforge/cookbook-monasca-agent'
 cookbook 'monasca_notification', git: 'https://github.com/stackforge/cookbook-monasca-notification'
 cookbook 'mon_persister', git: 'https://github.com/stackforge/cookbook-monasca-persister.git'
 cookbook 'monasca_schema', git: 'https://github.com/hpcloud-mon/cookbook-monasca-schema'

data_bags/monasca_agent/monasca_agent.json

@@ -1,9 +1,9 @@
 {
-  "id" : "mon_agent",
+  "id" : "monasca_agent",
   "keystone_url": "http://192.168.10.5:35357/v3",
   "username": "mini-mon",
   "password": "password",
   "project_name": "mini-mon",
-  "mon_api_url" : "http://192.168.10.4:8080/v2.0",
+  "monasca_api_url" : "http://192.168.10.4:8080/v2.0",
   "service": "mini-mon"
 }

roles/Devstack.json

@@ -14,7 +14,7 @@
     "recipe[devstack]",
     "recipe[devstack::mon-ui]",
     "recipe[devstack::keystone]",
-    "recipe[mon_agent]"
+    "recipe[monasca_agent]"
   ],
   "env_run_lists": {
   }

roles/Mini-Mon.json

@@ -82,7 +82,7 @@
     "recipe[storm::nimbus]",
     "recipe[storm::supervisor]",
     "recipe[mon_thresh]",
-    "recipe[mon_agent]"
+    "recipe[monasca_agent]"
   ],
   "env_run_lists": {
   }

split/data_bags/monasca_agent/monasca_agent.json

@@ -1,9 +1,9 @@
 {
-  "id" : "mon_agent",
+  "id" : "monasca_agent",
   "keystone_url": "http://192.168.10.5:35357/v3",
   "username": "mini-mon",
   "password": "password",
   "project_name": "mini-mon",
-  "mon_api_url" : "http://192.168.10.4:8080/v2.0",
+  "monasca_api_url" : "http://192.168.10.4:8080/v2.0",
   "service": "mini-mon"
 }

split/roles/Basenode.json

@@ -12,7 +12,7 @@
   "chef_type": "role",
   "run_list": [
     "recipe[mini-mon]",
-    "recipe[mon_agent]"
+    "recipe[monasca_agent]"
   ],
   "env_run_lists": {
   }

split/roles/Devstack.json

@@ -14,7 +14,7 @@
     "recipe[devstack]",
     "recipe[devstack::mon-ui]",
     "recipe[devstack::keystone]",
-    "recipe[mon_agent]"
+    "recipe[monasca_agent]"
   ],
   "env_run_lists": {
   }

tests/cli_wrapper.py

@@ -37,7 +37,7 @@ def delete_notification_if_exists(notification_name):
 def run_mon_cli(args, useJson=True):
     if useJson:
         args.insert(0, '--json')
-    args.insert(0, 'mon')
+    args.insert(0, 'monasca')
     try:
         stdout = subprocess.check_output(args)
         if useJson:

tests/measurement_test.py

@@ -7,8 +7,8 @@ import sys
 import time
 import pytz
 from datetime import datetime
-from monclient import client
-import monclient.exc as exc
+from monascaclient import client
+import monascaclient.exc as exc
 
 
 def call_mon_api(method, fields):

tests/notification_crud.py

@@ -8,7 +8,7 @@ import sys
 import os
 import time
 import notification
-import monclient.exc as exc
+import monascaclient.exc as exc
 import alarm
 import utils
 
@@ -96,10 +96,10 @@ def main():
     mon_client = utils.create_mon_client()
 
     try:
-        # Create 3 notifications with different emails, root, kafka, mon-agent
+        # Create 3 notifications with different emails, root, kafka, monasca-agent
         email1 = "root"
         email2 = "kafka"
-        email3 = "mon-agent"
+        email3 = "monasca-agent"
         notification_id_1 = find_or_create_notification(mon_client, email1,
                                                         email1 + "@localhost")
         notification_id_2 = find_or_create_notification(mon_client, email2,

tests/utils.py

@@ -5,7 +5,7 @@ import os
 import json
 import subprocess
 import cli_wrapper
-from monclient import client
+from monascaclient import client
 
 """
     Utility methods for testing